From 78b60efbbeb7571f3bd3808028a7106669a7bbb0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 9 Apr 2015 10:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E7=A1=AE=E5=AE=9A=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA=E9=9D=9E=E9=A1=B9=E7=9B=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f36e4b397..cfc4545a9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1947,6 +1947,8 @@ module ApplicationHelper
   end
 
   def bootstrap_render_dynamic_nav
+    hidden_non_project = Setting.find_by_name("hidden_non_project")
+    visiable = !(hidden_non_project && hidden_non_project.value == "0")
 
     main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.course_domain}
     main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain}
@@ -1964,21 +1966,21 @@ module ApplicationHelper
 
     #@nav_dispaly_project_label
     nav_list = Array.new
-    nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1
+    nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1 && visiable
     # nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label && @show_course == 1
-    nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label && @show_course == 1
+    nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label && @show_course == 1 && visiable
 
     nav_list.push(main_project_link) if @nav_dispaly_main_project_label
-    nav_list.push(main_course_link) if @nav_dispaly_main_course_label && @show_course == 1
-    nav_list.push(main_contest_link) if @nav_dispaly_main_contest_label && @show_contest == 1
+    nav_list.push(main_course_link) if @nav_dispaly_main_course_label && @show_course == 1 && visiable
+    nav_list.push(main_contest_link) if @nav_dispaly_main_contest_label && @show_contest == 1 && visiable
 
-    nav_list.push(courses_link) if @nav_dispaly_course_label && @show_course == 1
+    nav_list.push(courses_link) if @nav_dispaly_course_label && @show_course == 1 && visiable
     # nav_list.push(projects_link) if @nav_dispaly_project_label
     #nav_list.push(users_link) if @nav_dispaly_user_label
     # nav_list.push(contest_link) if @nav_dispaly_contest_label  && @show_contest == 1
-    nav_list.push(bids_link) if @nav_dispaly_bid_label
-    nav_list.push(forum_link) if @nav_dispaly_forum_label
-    nav_list.push(stores_link) if @nav_dispaly_store_all_label
+    nav_list.push(bids_link) if @nav_dispaly_bid_label && visiable
+    nav_list.push(forum_link) if @nav_dispaly_forum_label && visiable
+    nav_list.push(stores_link) if @nav_dispaly_store_all_label && visiable
 
     content_li = ''
     nav_list.collect do |nav_item|