From 4f7087f9aea3a9bcb7a1d46ddd101f2a37ad8ba5 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Thu, 15 May 2014 17:36:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BF=AE=E6=AD=A3=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=9A=84=E6=95=99=E5=B8=88=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AD=A6=E7=94=9F=E5=AD=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb   | 11 +++++++++++
 app/views/projects/_member_list.html.erb |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 01021cb57..116ccd5d7 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -812,6 +812,8 @@ class ProjectsController < ApplicationController
     @render_file = 'member_list'
     # 判断是否课程
     if @project.project_type == Project::ProjectType_course
+      @teachers= searchTeacherAndAssistant(@project)
+      @canShowCode = isCourseTeacher(User.current.id)
       case params[:role]
       when '1'
         @subPage_title = l :label_teacher_list
@@ -833,6 +835,15 @@ class ProjectsController < ApplicationController
     render :layout => 'base_courses' if @project.project_type == 1
   end
 
+  #判断指定用户是否为课程教师
+  def isCourseTeacher(id)
+     result = false
+    if  @teachers.find_by_user_id(id) != nil
+      result = true
+    end
+    result
+  end
+
   def sort_project_members project, members
     #userGrade = UserGrade.where(:project_id => project.id)
     users = UserGrade.where(:project_id => project.id).
diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb
index ce5dfc694..6fe6b55f0 100644
--- a/app/views/projects/_member_list.html.erb
+++ b/app/views/projects/_member_list.html.erb
@@ -12,7 +12,7 @@
 		<% if @project.project_type == 1 %>
 			<% unless member.user.user_extensions.identity ==0 %>
 		    <!-- added by bai 加学号 -->	
-		    	<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil?) %>   
+		    	<%if @canShowCode# if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil?) %>
 		    		<%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %>
 				<% end %>
 			<% end %>