From dc0b7defa18179e5eeff55529feef1a9dd2f6758 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Apr 2016 11:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93show=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=AE=80=E5=8C=96=E5=8F=8A=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 9bb6055ee..60f3724f8 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -332,7 +332,7 @@ update # end #if( !User.current.member_of?(@project) || @project.hidden_repo) - @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? + # @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? # :name, :path, :kind, :size, :lastrev, :changeset @entries = @repository.entries(@path, @rev) @@ -348,24 +348,24 @@ update # (show_error_not_found; return) unless @entries g = Gitlab.client @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 = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count # 访问该页面的是会后则刷新 if @project.project_score.nil? ProjectScore.create(:project_id => @project.id, :score => false) end + # 刷新改页面的时候,更新统计数 if @changesets_all_count != @project.project_score.changeset_num && @changesets_all_count != 0 update_commits_count(@project, @changesets_all_count) end # end + # 最近一次提交 @changesets_latest_coimmit = @changesets[0] unless @changesets[0].blank? update_commits_date(@project, @changesets_latest_coimmit) end @properties = @repository.properties(@path, @rev) @repositories = @project.repositories - @course_tag = params[:course] project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT ip = RepositoriesHelper::REPO_IP_ADDRESS gitlab_address = Redmine::Configuration['gitlab_address'] @@ -374,11 +374,7 @@ update else @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s end - if @course_tag == 1 - render :action => 'show', :layout => 'base_courses' - else - render :action => 'show', :layout => 'base_projects' - end + render :action => 'show', :layout => 'base_projects' end end