From 924db06cbf73066b5a21d47d7bc8f3e88afd3d16 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 18 Sep 2016 15:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E5=BA=93?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=A3=E7=A0=81=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 42 +++++++++++++-------------
 app/views/projects/show.html.erb       | 11 -------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8d4c09ded..df40eb378 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -325,27 +325,27 @@ class ProjectsController < ApplicationController
     end
 
     # 版本库统计图
-    unless @project.gpid.nil? || @project.project_score.changeset_num == 0
-      # rep_statics_commit = @project.rep_statics.order("commits_num desc")
-      rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")
-      rep_statics_code = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by changeset desc limit 10")
-      # rep_statics_code = @project.rep_statics.sort_by {|u| u.changeset}.reverse
-      @a_uname = rep_statics_commit.map {|s| s.uname }
-      @a_uname_code = rep_statics_code.map {|s| s.uname }
-      @a_commits_num = rep_statics_commit.map {|s| s.commits_num.to_i }
-      @a_commits_add = rep_statics_code.map {|s| s.add.to_i }
-      @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
-      @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
-      g = Gitlab.client
-      begin
-        gid = @project.gpid
-        g_project = g.project(gid)
-        g_branch = g_project.default_branch.to_s
-      rescue =>e
-        logger.error("get default branch failed: " + e)
-      end
-      @rev = g_branch.nil? ? "master" : g_branch
-    end
+    # unless @project.gpid.nil? || @project.project_score.changeset_num == 0
+    #   # rep_statics_commit = @project.rep_statics.order("commits_num desc")
+    #   rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")
+    #   rep_statics_code = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by changeset desc limit 10")
+    #   # rep_statics_code = @project.rep_statics.sort_by {|u| u.changeset}.reverse
+    #   @a_uname = rep_statics_commit.map {|s| s.uname }
+    #   @a_uname_code = rep_statics_code.map {|s| s.uname }
+    #   @a_commits_num = rep_statics_commit.map {|s| s.commits_num.to_i }
+    #   @a_commits_add = rep_statics_code.map {|s| s.add.to_i }
+    #   @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
+    #   @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
+    #   g = Gitlab.client
+    #   begin
+    #     gid = @project.gpid
+    #     g_project = g.project(gid)
+    #     g_branch = g_project.default_branch.to_s
+    #   rescue =>e
+    #     logger.error("get default branch failed: " + e)
+    #   end
+    #   @rev = g_branch.nil? ? "master" : g_branch
+    # end
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
       format.html
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 39d8a9847..6c4e2b802 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -29,17 +29,6 @@
     <!--CONTENT LIST-->
 
   </div>
-  <%# 时间紧，权限待优化 %>
-  <% unless @project.hidden_repo && !User.current.member_of?(@project) && !User.current.admin? %>
-      <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank?  %>
-          <div class="resources mt10">
-            <div class="homepagePostBrief">
-              <%= render :partial => "rep_static" %>
-              <div class="cl"></div>
-            </div>
-          </div>
-      <% end %>
-  <% end %>
 
   <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
 </div>
\ No newline at end of file