From 6dc057d03ca28bbb3e837a2af9d759d004d41f3c Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 10 Dec 2014 20:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=80=81=E5=B8=88=E3=80=81?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 10 ++++++----
 app/services/courses_service.rb       | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index ac25d59cf..26b96eaf3 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -207,19 +207,21 @@ class CoursesController < ApplicationController
   def member
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'member_list'
-    @teachers= searchTeacherAndAssistant(@course)
+    #@teachers= searchTeacherAndAssistant(@course)
     @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     case params[:role]
       when '1'
         @subPage_title = l :label_teacher_list
-        @members = searchTeacherAndAssistant(@course)
+        #@members = searchTeacherAndAssistant(@course)
       when '2'
         @subPage_title = l :label_student_list
-        @members = searchStudent(@course)
+        #@members = searchStudent(@course)
       else
         @subPage_title = ''
-        @members = @course.member_principals.includes(:roles, :principal).all.sort
+        #@members = @course.member_principals.includes(:roles, :principal).all.sort
     end
+    cs = CoursesService.new
+    @members = cs.course_teacher_or_student_list(params,@course)
     @members = paginateHelper @members
     render :layout => 'base_courses'
   end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index f1c2babbe..0468de367 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -1,5 +1,6 @@
 class CoursesService
   include ApplicationHelper
+  include CoursesHelper
   #参数school_id为0或不传时返回所有课程，否则返回对应学校的课程
   #参数per_page_count分页功能，每页显示的课程数
   #参数page分页功能，当前页码
@@ -47,4 +48,22 @@ class CoursesService
     url_to_avatar(obj)
   end
 
+  #课程老师或课程学生列表
+  def course_teacher_or_student_list params,course
+    @teachers= searchTeacherAndAssistant(course)
+    #@canShowCode = isCourseTeacher(User.current.id,course) && params[:role] != '1'
+    case params[:role]
+      when '1'
+        #@subPage_title = l :label_teacher_list
+        @members = searchTeacherAndAssistant(course)
+      when '2'
+        #@subPage_title = l :label_student_list
+        @members = searchStudent(course)
+      else
+        #@subPage_title = ''
+        @members = @course.member_principals.includes(:roles, :principal).all.sort
+    end
+    @members
+  end
+
 end
\ No newline at end of file