From 406d608edc387f5e5ad749758c8822f43d8ffe5b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 13 May 2015 11:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE=20--=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=20--?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=85=A5=E5=8F=A3=E9=9A=90=E8=97=8F=20--?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E9=80=9A=E8=BF=87url=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb         | 12 ++++++------
 app/views/layouts/_base_development_group.html.erb |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 5fe953563..d0af82c8c 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -244,12 +244,12 @@ update
 
   def show
     ## TODO: the below will move to filter, done.
-    # if !User.current.member_of?(@project)
-    #   if @project.hidden_repo
-    #     render_403 
-    #     return -1
-    #   end
-    # end
+    if !User.current.member_of?(@project)
+      if @project.hidden_repo
+        render_403
+        return -1
+      end
+    end
     #if( !User.current.member_of?(@project) || @project.hidden_repo)
     @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
 
diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb
index 058095a20..49719fbd5 100644
--- a/app/views/layouts/_base_development_group.html.erb
+++ b/app/views/layouts/_base_development_group.html.erb
@@ -37,13 +37,14 @@
             <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
         <% end %>
       </div>
-  <% end%>
-  <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
+  <% end %>
+  <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
+  <% unless @project.hidden_repo || @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
       <div class="subNav">
         <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
         <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
       </div>
-      <% end %><!--meny end -->
+  <% end %><!--meny end -->
 
   <!-- more -->
   <div class="subNav subNav_jiantou" onclick="$('#navContent').toggle(500);" id="expand_tools_expand"><%= l(:label_project_more) %></div>