From 27e72c1f390eb6252bffaaf1906da4da07ca6789 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 11 Mar 2015 15:14:23 +0800
Subject: [PATCH] =?UTF-8?q?#2000=20=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_newissue_index.html.erb |  2 +-
 app/views/layouts/base_projects.html.erb  | 22 +++++++++++++++-------
 app/views/projects/_tools_expand.html.erb | 16 +++++++++++++++-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app/views/issues/_newissue_index.html.erb b/app/views/issues/_newissue_index.html.erb
index b89ba41a2..4b282aa8f 100644
--- a/app/views/issues/_newissue_index.html.erb
+++ b/app/views/issues/_newissue_index.html.erb
@@ -2,7 +2,7 @@
   <h2 class="project_h2">问题跟踪</h2>
 </div>
 <div class="problem_top">
-  <% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %>
+  <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
       <span>
         <% if User.current.member_of?(@project) %>
             <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 9b4c22b75..e61e75018 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -137,13 +137,16 @@
 										<div class="subNav">
 											<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 										</div>
-										<div class="subNav">
-											<%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.issues.count %>)</span>
-											<span>
-                                              <% if User.current.logged? &&  User.current.member_of?(@project) %>
-                                                <%= link_to "+发布问题", new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
-                                              <% end %>
-										</div>
+                                          <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+                                            <div class="subNav">
+                                                <%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.issues.count %>)</span>
+                                                <span>
+                                                  <% if User.current.logged? &&  User.current.member_of?(@project) %>
+                                                    <%= link_to "+发布问题", new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
+                                                  <% end %>
+                                            </div>
+                                          <% end%>
+                                      <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
 										<div class="subNav">
 											<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
@@ -151,12 +154,16 @@
 											    <%= link_to "+发贴", project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
+                                      <% end%>
+                                      <% unless @project.enabled_modules.where("name = 'files'").empty? %>
 										<div class="subNav">
 											<%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
                                             <% if User.current.logged? &&  User.current.member_of?(@project) %>
                                                 <%= link_to "+上传资源", new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
+                                      <% end%>
+                                      <% unless @project.enabled_modules.where("name = 'repository'").empty? %>
 										<div class="subNav">
 											<%= link_to l(:field_user_active_changeset), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.repositories.count %>)</span>
@@ -164,6 +171,7 @@
 											    <%= link_to "+创建版本库",  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
                                             <% end %>
 										</div>
+                                      <% end %>
 
 										<div class="subNav subNav_jiantou"><%= l(:label_more) %></div>
 										<ul class="navContent" style="padding-left: 0px">
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index fed10b3f2..8608bdfb8 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -4,27 +4,41 @@
     <% end %>
 </li>
 <li>
-  <%= link_to l(:field_user_active_news), project_news_index_path(@project) %>
+  <% unless @project.enabled_modules.where("name = 'news'").empty? %>
+    <%= link_to l(:field_user_active_news), project_news_index_path(@project) %>
+  <% end%>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'wiki'").empty? %>
 	<%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'code_review'").empty? %>
 	<%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'calendar'").empty? %>
 	<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'gantt'").empty? %>
 	<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
+  <% end %>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'documents'").empty? %>
 	<%= link_to l(:project_module_documents), project_documents_path(@project) %>
+  <% end %>
 </li>
 <li>
 	<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
 </li>
 <li>
+  <% unless @project.enabled_modules.where("name = 'dts'").empty? %>
 	<%= link_to l(:label_module_share) ,share_show_path(@project) %>
+  <% end %>
 </li>