Merge branch 'dev_hjq' into szzh

app/controllers/boards_controller.rb

@@ -103,7 +103,7 @@ class BoardsController < ApplicationController
           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
           #现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
           @topics =  @board.topics.
-              reorder("#{Message.table_name}.created_on desc").
+              reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).

app/controllers/repositories_controller.rb

@@ -46,6 +46,7 @@ class RepositoriesController < ApplicationController
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
+    if @project.repositories.count == 0
       scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
       @repository = Repository.factory(scm)
       @repository.is_default = @project.repository.nil?
@@ -56,6 +57,10 @@ class RepositoriesController < ApplicationController
       else
         render :layout => 'base_projects'
       end
+    else
+      render_403
+    end
+
   end
   
   

app/helpers/application_helper.rb

@@ -2349,6 +2349,7 @@ module ApplicationHelper
 
   #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
   def user_for_homework_common homework,is_teacher
+    if User.current.member_of_course?(homework.course)
       if is_teacher #老师显示作品数量
         link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
@@ -2357,7 +2358,7 @@ module ApplicationHelper
           link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品已交",  "javascript:void(0)", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+            link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_type == 2 #编程作业不能修改作品
             link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
           else
@@ -2367,6 +2368,8 @@ module ApplicationHelper
       end
     end
 
+  end
+
   def student_anonymous_comment homework
     if  homework.homework_detail_manual
       case homework.homework_detail_manual.comment_status

app/models/project.rb

@@ -91,6 +91,8 @@ class Project < ActiveRecord::Base
                             
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
   has_many :project_tags, :class_name => 'ProjectTags'
+  # 动态级联删除
+  has_many :forge_activities, :class_name => 'ForgeActivity', :dependent => :destroy
   # 关联虚拟表
   has_many :forge_messages, :class_name =>'ForgeMessage', :as => :forge_message, :dependent => :destroy
 

app/views/boards/_project_show.html.erb

@@ -51,9 +51,9 @@
                            :data => {:confirm => l(:text_are_you_sure)},
                            :class => 'talk_edit fr',
                            :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
-                <%# if topic.sticky? %>
-                  <!--<a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%#= l(:label_board_sticky)%></a>-->
-                <%# end %>
+                <% if topic.sticky? %>
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
+                <% end %>
                 <script>
                     //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
                     //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug

app/views/issues/index.html.erb

@@ -47,7 +47,7 @@
       <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'true', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
           <%= hidden_field_tag 'set_filter', '1' %>
           <div class="problem_search" >
-            <input class="problem_search_input fl" id="v_subject" type="text" name="subject" value="<%= @subject ? @subject : ""%>" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
+            <input class="problem_search_input fl" id="v_subject" type="text" name="subject" placeholder="请输入问题名称" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
             <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
             <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
           </div><!--problem_search end-->

app/views/projects/settings/_new_repositories.html.erb

@@ -43,24 +43,26 @@
               <% end %></td>
           </tr>
       <% end %>
+      </tbody>
+    </table>
 <% else %>
-  <p class="nodata"><%= l(:label_no_data) %></p>
+    <p class="nodata"><%= l(:label_repository_no_data) %></p>
 <% end %>
 
-  </tbody>
-</table>
-<a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
-<a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
+<%# 新建版本库 %>
+<% if @project.repositories.count == 0 %>
+    <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
+    <a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
       <% course_tag = @project.project_type %>
       <% if User.current.allowed_to?(:manage_repository, @project) %>
           <!--newrepo_project_repository_path(@project, :course => course_tag) -->
           <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
       <% end %>
-</a>
-<div class="cl"></div>
+    </a>
+    <div class="cl"></div>
 
-<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
-<div id="pro_st_edit_ku" class="pro_st_edit_ku">
+    <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
+        <div id="pro_st_edit_ku" class="pro_st_edit_ku">
           <ul>
             <li >
               <label class="label02"><%=l(:label_scm)%>：</label>
@@ -96,5 +98,8 @@
           </ul>
           <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>
           <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl ml10"><%=l(:button_cancel)%></a>
-</div><!--pro_st_edit_issues end-->
+        </div><!--pro_st_edit_issues end-->
+    <% end %>
+
 <% end %>
+

app/views/student_work/_add_score.html.erb

@@ -16,7 +16,7 @@
             <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
           </div>
       <%end%>
-      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();">提交</a>
+      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();$('#about_hwork_<%= @work.id%>').html('');">提交</a>
       <div class="cl"></div>
     </li>
 <% end%>

app/views/student_work/_evaluation_un_work.html.erb

@@ -3,7 +3,7 @@
   <li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
     <ul>
       <li class="hworkPortrait mt15 mr10">
-        <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(User.current.id))%>
+        <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
       </li>
       <div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
         <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">

app/views/student_work/_evaluation_work.html.erb

@@ -13,7 +13,7 @@
               <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
             </div>
           </li>
-          <li>
+          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             <ul class="mt10 fl">
               <li class="hworkStName mr10 mt16" title="姓名">
                 <%= student_work.user.show_name%>
@@ -32,7 +32,7 @@
               <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
             </div>
           </li>
-          <li>
+          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             <ul class="mt10 fl">
               <li class="hworkStName mr10 mt16" title="姓名">
                 匿名
@@ -46,7 +46,7 @@
 
     </ul>
   </li>
-  <li class="hworkList130 c_grey">
+  <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
     <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
         <span class="c_red">[迟交]</span>

app/views/student_work/index.html.erb

@@ -6,17 +6,17 @@
   });
 
     // 匿评弹框提示
-  <% if @is_evaluation && !@stundet_works.empty?%>
-      $(function(){
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/praise_alert') %>');
-          showModal('ajax-modal', '500px');
-          $('#ajax-modal').siblings().remove();
-          $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-          "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-          $('#ajax-modal').parent().css("top","").css("left","");
-          $('#ajax-modal').parent().addClass("anonymos");
-      });
-  <% end%>
+  <%# if @is_evaluation && !@stundet_works.empty?%>
+//      $(function(){
+//          $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'student_work/praise_alert') %>');
+//          showModal('ajax-modal', '500px');
+//          $('#ajax-modal').siblings().remove();
+//          $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+//          "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+//          $('#ajax-modal').parent().css("top","").css("left","");
+//          $('#ajax-modal').parent().addClass("anonymos");
+//      });
+  <%# end%>
 
   //设置评分规则
   function set_score_rule(){

app/views/users/_course_homework.html.erb

@@ -24,10 +24,12 @@
           <span class="grey_btn_cir ml10">匿评已结束</span>
       <% end%>
       <div class="homepagePostSubmitContainer">
+        <% if User.current.member_of_course?(activity.course) %>
             <div class="homepagePostSubmit">
               <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
               <%= user_for_homework_common activity,is_teacher %>
             </div>
+        <% end %>
 
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">

app/views/users/_user_message_course.html.erb

@@ -144,9 +144,13 @@
             </p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
             <p>
-              截止日期：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
+              匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
             </p>
+            <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
+              <p>请您尽早完成匿评！如果您在规定时间内未完成匿评，一次将被扣<%= ma.course_message.homework_detail_manual.absence_penalty %>分。</p>
+            <% end%>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
@@ -193,12 +197,15 @@
           <div style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，
-              失败原因：提交作品的人数低于2人
+              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败！
+              <p> 失败原因：提交作品的人数低于2人</p>
             </p>
             <p>作业详情如下：</p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+            <p>
+              提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;24点</span>
+            </p>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
@@ -281,9 +288,22 @@
                             :onmouseover =>"message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %></a></li>
                 <div  style="display: none" class="message_title_red system_message_style" >
-                  <%= ma.content.html_safe %>
                   <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
                   <p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
+                  <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
+                  <p>
+                    作品评分：<%= content[0] %>
+                  </p>
+                  <% if content.size > 1 %>
+                      <div class="fl">作品评语：</div>
+                      <div class="ml60"><%= content[1] %></div>
+                  <% end %>
+                  <p>
+                    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。
+                  </p>
+                  <p>
+                    期待你取得更大的进步！
+                  </p>
                 </div>
             <% end %>
             <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>

config/locales/commons/zh.yml

@@ -200,6 +200,7 @@ zh:
   label_subject_empty: 主题不能为空
 
   label_no_data: 没有任何数据可供显示
+  label_repository_no_data: 您还没有创建版本库，每个项目只允许创建一个版本库！
   # 项目、课程、用户公用
   label_settings: 配置
   label_information_plural: 信息