Merge branch 'hjq_new_course' into develop

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 = changesets_num(@project)
       @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/views/repositories/show.html.erb

@@ -52,8 +52,7 @@
         </span>
 
          <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
-
-            <%=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>
+           <%=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> 提交
 
         </span>
       </div>

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"