From ca519ce22df7ccf5b5aaf54e7c5b54fba4d4b950 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Sep 2014 16:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb   | 2 +-
 app/views/courses/_member_list.html.erb | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index c73a1e0fc..9ae57db3d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -641,7 +641,7 @@ class CoursesController < ApplicationController
   def isCourseTeacher(id,course)
     result = false
     user = User.find(id)
-    if user.nil? && user.allowed_to?(:as_teacher,course)#@teachers && @teachers.count != 0 && @teachers.find_by_user_id(id) != nil
+    if !user.nil? && user.allowed_to?(:as_teacher,course)
       result = true
     end
     result
diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index a8a9e8085..edd04bc97 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -13,11 +13,8 @@
       <% end %>
 		<!--teacher's code disapeared  moified by huang-->
 
-      <% unless member.user.user_extensions.identity ==0 %>
-          <!-- added by bai 加学号 -->
-          <%if @canShowCode%>
-              <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %>
-          <% end %>
+      <%if @canShowCode%>
+        <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %>
       <% end %>
       <div class ="clear avatar_name"> &nbsp;
         <p>