From 18271946d79c68971267e644d3770551b6d880c8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sun, 1 Mar 2015 17:31:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=88=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BD=9C=E8=80=85=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/homework.rb   | 10 ++++++++--
 app/controllers/courses_controller.rb |  3 ++-
 app/services/courses_service.rb       |  6 +++---
 app/services/homework_service.rb      |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/api/mobile/entities/homework.rb b/app/api/mobile/entities/homework.rb
index 9be9bc53e..5b996c1af 100644
--- a/app/api/mobile/entities/homework.rb
+++ b/app/api/mobile/entities/homework.rb
@@ -18,8 +18,14 @@ module Mobile
       homework_expose :id
       #课程名称
       homework_expose :course_name
-      #课程老师
-      homework_expose :course_teacher
+      #作业发布者
+      expose :author,using: Mobile::Entities::User  do |f, opt|
+         f[:author]
+      end
+
+      #作业发布者真名
+      homework_expose :author_real_name
+
       #作业次数
       homework_expose :homework_times
       #作业名称
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 19f9c0fa2..b6fc21bf9 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -98,7 +98,8 @@ class CoursesController < ApplicationController
   #更新课程信息
   def update
     cs = CoursesService.new
-    @course = cs.edit_course params,@course,User.current
+    c = cs.edit_course params,@course,User.current
+    @course = c[:course]
     if @course.errors.full_messages.count <= 0
         respond_to do |format|
           format.html {
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index ab0a53744..1f5ca7894 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -3,7 +3,7 @@ class CoursesService
   include CoursesHelper
   include HomeworkAttachHelper
   include ApiHelper
-  #TODO:尚未整合权限系统
+
   #参数school_id为0或不传时返回所有课程，否则返回对应学校的课程
   #参数per_page_count分页功能，每页显示的课程数
   #参数page分页功能，当前页码
@@ -356,7 +356,7 @@ class CoursesService
 
   private
   def show_homework_info course,bid,current_user,is_course_teacher
-    author = bid.author.lastname + bid.author.firstname
+    author_real_name = bid.author.lastname + bid.author.firstname
     many_times = course.homeworks.index(bid) + 1
     name = bid.name
     homework_count = bid.homeworks.count  #已提交的作业数量
@@ -369,7 +369,7 @@ class CoursesService
     end
     #end
     open_anonymous_evaluation = bid.open_anonymous_evaluation
-    {:course_name => course.name,:id => bid.id, :course_teacher => author, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
+    {:course_name => course.name,:id => bid.id, :author => bid.author,:author_real_name => author_real_name, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
      :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:homework_for_anonymous_comments => homework_for_anonymous_comments}
   end
 
diff --git a/app/services/homework_service.rb b/app/services/homework_service.rb
index dd2d2356e..c5a333125 100644
--- a/app/services/homework_service.rb
+++ b/app/services/homework_service.rb
@@ -26,7 +26,7 @@ class HomeworkService
     state = @bid.comment_status
     #end
     open_anonymous_evaluation = @bid.open_anonymous_evaluation
-    {:course_name => course.name,:id => @bid.id, :course_teacher => author, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
+    {:course_name => course.name,:id => @bid.id, :author => @bid.author,:author_real_name =>author,  :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
      :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation}
   end