From 0906da513239c89f9fa4cf7ad58554c2b83eda89 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 8 Oct 2016 10:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 38 ++++++++--------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 3fdbe2f89..491699cd3 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -376,11 +376,21 @@ update
 
   def show
     ## TODO: the below will move to filter, done.
+    # 访问版本庫后更新project_score表数据；changeset_num为提交总数
+    project_score = @project.project_score
+    if project_score.nil?
+      ProjectScore.create(:project_id => @project.id, :score => false)
+    else
+      project_score.update_column(:changeset_num, @changesets_all_count)
+    end
+    unless @changesets_latest_coimmit.blank?
+      update_commits_date(@project, @changesets_latest_coimmit)
+    end
 
     # 获取版本库目录结构
-    @entries = @repository.entries(@path, @rev)
+    #@entries = @repository.entries(@path, @rev)
     if request.xhr?
-      @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
+      #@entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
       @changesets = @g.commits(@project.gpid, :ref_name => @rev)
       # 最近一次提交
@@ -388,34 +398,14 @@ update
       g_project = @g.project(@project.gpid)
       # 总的提交数
       @changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count
-
       # 获取默认分支
       @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
-
-      # 访问版本庫后更新project_score表数据；changeset_num为提交总数
-      project_score = @project.project_score
-      if project_score.nil?
-        ProjectScore.create(:project_id => @project.id, :score => false)
-      else
-        project_score.update_column(:changeset_num, @changesets_all_count)
-      end
-
-      unless @changesets_latest_coimmit.blank?
-        update_commits_date(@project, @changesets_latest_coimmit)
-      end
       @creator = @project.owner.to_s
       gitlab_address = Redmine::Configuration['gitlab_address']
-
       # REDO:需优化，仅测试用
       @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token
-
-      # 获取版本库路径，主要分为两种，一种随Gitlab类型，另一种为Git类型，Git类型为无用数据，最终需要删掉这种类型。
-      # if @repository.type.to_s == "Repository::Gitlab"
-        @repos_url = gitlab_address.to_s+"/" + @creator + "/" + @repository.identifier+"."+"git"
-      # 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
-      render :action => 'show', :layout => 'base_projects'
+      @repos_url = gitlab_address.to_s+"/" + @creator + "/" + @repository.identifier+"."+"git"
+      render :layout => 'base_projects'
     end
   end