From a6e80ed938898fed7737026061b10df93dda44fd Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 2 Jul 2015 15:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=94=A8=E6=88=B7=E5=8F=B3?=
 =?UTF-8?q?=E4=B8=8A=E8=A7=92=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_header.html.erb | 15 +++++++--------
 app/views/layouts/_new_header.html.erb  |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index fa8787122..b800a1722 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -17,15 +17,14 @@
                 visiable = hidden_non_project && hidden_non_project.value == "0"%>
 			<ul class="sub_menu">
               <% if @show_course == 1 && !visiable %>
-				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
-                    <% hasCourse=false %>
-                    <% User.current.courses.each do |course| %>
-                        <% if !course_endTime_timeout?(course) %>
-                              <% hasCourse=true %>
-                        <% end %>
+                <% hasCourse=false %>
+                <% User.current.courses.each do |course| %>
+                    <% if !course_endTime_timeout?(course) %>
+                          <% hasCourse=true %>
+                          <% break %>
                     <% end %>
-                      <%= render :partial => 'layouts/user_courses_list', :locals => {:hasCourse => hasCourse} %>
-				<% end -%>
+                <% end %>
+                <%= render :partial => 'layouts/user_courses_list', :locals => {:hasCourse => hasCourse} %>
               <% end %>
               <%= render :partial => 'layouts/user_project_list', :locals => {:hasCourse => hasCourse} %>
               <li style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index f26317acd..481ebeca6 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -20,7 +20,7 @@
             <li id="current_user_li">
               <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, target:"_blank", :class => "uses_name"%>
               <ul id="user_sub_menu" style="right: 0px;display: none;">
-                <% if @show_course == 1 && User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) %>
+                <% if @show_course == 1 %>
                     <% user_course = get_user_course User.current%>
                     <% unless user_course.empty? %>
                         <li  id="my_courses_li">