From a6882d0f88bd67ebc9fc6fc72658f859012a2fc5 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 10 Feb 2015 17:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=8F=8A=E6=98=BE=E7=A4=BA=E8=AF=BE=E7=A8=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=AF=E8=AF=BE=E7=A8=8B=E6=88=90=E5=91=98=E3=80=81=E5=8F=8A?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E8=AF=BE=E7=A8=8B=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb  | 7 +++++--
 app/services/courses_service.rb | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index daac8bcb0..8b167980d 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -8,10 +8,11 @@ module Mobile
           optional :school_id, type: Integer, desc: '传入学校id,返回该学校课程列表'
           requires :per_page_count, type: Integer, desc: '每页总数'
           requires :page, type: Integer, desc: '当前页码'
+          optional :token, type: String
         end
         get do
           cs = CoursesService.new
-          courses = cs.course_list(params)
+          courses = cs.course_list(params,current_user.nil? ? User.find(2):current_user)
           present :data, courses, with: Mobile::Entities::Course
           present :status, 0
         end
@@ -166,13 +167,15 @@ module Mobile
         desc "返回单个课程"
         params do
           requires :id, type: Integer
+          optional :token, type: String
         end
         route_param :id do
           get do
             cs = CoursesService.new
             course = cs.show_course(params,(current_user.nil? ? User.find(2):current_user))
             #course = Course.find(params[:id])
-            {status: 0, data: course}
+            present :data, course, with: Mobile::Entities::Course
+            present :status, 0
           end
         end
 
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 11adc3c09..0304722de 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -7,7 +7,7 @@ class CoursesService
   #参数school_id为0或不传时返回所有课程，否则返回对应学校的课程
   #参数per_page_count分页功能，每页显示的课程数
   #参数page分页功能，当前页码
-  def course_list params
+  def course_list params,current_user
     @school_id = params[:school_id]
     per_page_option = params[:per_page_count] || 10
     page_no = params[:page] || 1
@@ -25,7 +25,7 @@ class CoursesService
     @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
     course_list = []
     @courses.each do |course|
-      course_list << {:course => course,:img_url => url_to_avatar(course)}
+      course_list << {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}
     end
     course_list
   end
@@ -163,7 +163,7 @@ class CoursesService
     unless (course.is_public == 1 ||  currnet_user.member_of_course?(@course)|| currnet_user.admin?)
       raise '403'
     end
-    course
+    {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}
   end
 
   #创建课程