Merge branch 'develop' into cxt_course

app/controllers/issues_controller.rb

@@ -185,7 +185,7 @@ class IssuesController < ApplicationController
       respond_to do |format|
         format.html {
           render_attachment_warning_if_needed(@issue)
-          flash[:notice] = l(:label_successful_create)
+          #flash[:notice] = l(:label_successful_create)
           #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject))
           #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
           if params[:continue]

app/controllers/repositories_controller.rb

@@ -351,7 +351,7 @@ update
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
-      @changesets_all_count = 0
+      @changesets_all_count = @project.gpid.nil? ? 0 : g.commits_total_count(@project.gpid).count
       @changesets_latest_coimmit = @changesets[0]
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories
@@ -383,10 +383,10 @@ update
     @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
 
     #add by hx
-    rep_count = commit_count(@project)
+    #rep_count = commit_count(@project)
 
     #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
-    @commits_count = rep_count
+    @commits_count = params[:commit_count].to_i
     @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]
 
     @commit = g.commit(@project.gpid,@rev)

app/models/news.rb

@@ -41,7 +41,7 @@ class News < ActiveRecord::Base
   validates_presence_of :title, :description
   validates_length_of :title, :maximum => 60
   validates_length_of :summary, :maximum => 255
-  validates_length_of :description, :maximum => 10000
+  # validates_length_of :description, :maximum => 10000
 
   acts_as_attachable :delete_permission => :manage_news
   acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project

app/views/issues/_form.html.erb

@@ -7,7 +7,7 @@
               <label class="label"><span class="c_red f12">*</span>&nbsp;类型&nbsp;&nbsp;:&nbsp;</label>
               <%= f.select :tracker_id, @issue.project.trackers.collect { |t| [t.name, t.id] },
                         {:required => true, :no_label => true},
-                         :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                         #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
                          :class => "w90" %>
           <% end %>
         </li>
@@ -49,7 +49,7 @@
               <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
               <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
               <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
-              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'85%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
               <%# end %>
               <%#= wikitoolbar_for 'issue_description' %>
           <% end %>

app/views/repositories/show.html.erb

@@ -52,8 +52,7 @@
         </span>
 
          <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
-
+           <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
-            <%=link_to"提交明细", {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font>
 
         </span>
       </div>

app/views/student_work/_add_score.html.erb

@@ -1,9 +1,10 @@
-<%= form_for('new_form', :remote => true, :method => :post,:url => add_score_student_work_path(work.id)) do |f|%>
+<%= form_for('new_form', :remote => true, :method => :post,:url => add_score_student_work_path(work.id),:id=>'add_score_'+work.id.to_s) do |f|%>
     <li >
       <span class="tit_fb"> 评价：</span>
-      <%= f.text_area 'user_message', :class => 'hwork_ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
+      <%= f.text_area 'user_message', :class => 'hwork_ping_text', :id => 'score_comment_'+work.id.to_s, :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
       <div class="cl"></div>
     </li>
+    <p id="hint_message_<%=work.id %>" style="margin-left: 65px;"></p>
     <li >
       <span class="tit_fb mt2"> 评分：</span>
       <input type="number" name="score" id="score_<%= work.id%>" value="<%= score.nil? ? 60 : score.score%>" min="0" max="100" size="4" data-units="dollars" />
@@ -16,7 +17,19 @@
             <%= 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();$('#about_hwork_<%= work.id%>').html('');">提交</a>
+      <a href="javascript:void(0);" id="work_submit_<%= work.id %>" class="blue_n_btn fr evaluation_submit" onclick="score_submit('<%=work.id %>');">提交</a>
       <div class="cl"></div>
     </li>
 <% end%>
+<script type="text/javascript">
+    function score_submit(id){
+        if ($.trim($('#score_comment_'+id).val()) == "") {
+            $('#hint_message_'+id).html("为了对其他学生的作品负责，请您务必填写评语");
+            $("#hint_message_"+id).css('color','#ff0000');
+            $("#score_comment_"+id).focus();
+        } else {
+            $("#work_submit_"+id).parent().parent().submit();
+            $('#about_hwork_'+id).html('');
+        }
+    }
+</script>

db/schema.rb

@@ -1569,6 +1569,7 @@ ActiveRecord::Schema.define(:version => 20151218110033) do
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
+  add_index "student_works", ["homework_common_id"], :name => "index"
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
     t.integer  "student_work_id"