From 25672aa229f79204433eb281c998190657ce0938 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 20 May 2015 17:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 34 ++++++++++++++++++-
 config/locales/zh.yml                         |  2 ++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index a185e3edf..a6702de5f 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -1,7 +1,7 @@
 class HomeworkCommonController < ApplicationController
   layout "base_courses"
   before_filter :find_course, :only => [:index,:new,:create]
-  before_filter :find_homework, :only => [:edit]
+  before_filter :find_homework, :only => [:edit,:update]
 
   def index
     homeworks = @course.homework_commons
@@ -81,7 +81,38 @@ class HomeworkCommonController < ApplicationController
   end
 
   def update
+    @homework.name = params[:homework_common][:name]
+    @homework.description = params[:homework_common][:description]
+    @homework.end_time = params[:homework_common][:end_time]
+    @homework.publish_time = params[:homework_common][:publish_time]
+    @homework.homework_type = params[:homework_common][:homework_type]
+    @homework.late_penalty = params[:late_penalty]
+    @homework.user_id = User.current.id
+    @homework.course_id = @course.id
 
+    #匿评作业相关属性
+    @homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+    @homework_detail_manual.evaluation_start = params[:evaluation_start]
+    @homework_detail_manual.evaluation_end = params[:evaluation_end]
+    @homework_detail_manual.evaluation_num = params[:evaluation_num]
+    @homework_detail_manual.absence_penalty = params[:absence_penalty]
+
+    if @homework.save && @homework_detail_manual.save
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_edit)
+          redirect_to homework_common_index_path(:course => @course.id)
+        }
+      end
+      return
+    else
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_failed_edit)
+          redirect_to edit_homework_common_path(@homework)
+        }
+      end
+    end
   end
 
   def destroy
@@ -115,6 +146,7 @@ class HomeworkCommonController < ApplicationController
   #获取作业
   def find_homework
     @homework = HomeworkCommon.find params[:id]
+    @homework_detail_manual = @homework.homework_detail_manual
     @course = @homework.course
   rescue
     render_404
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c98220c90..e4ac63854 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -14,6 +14,8 @@ zh:
   notice_successful_create: 创建成功
   notice_failed_create: 创建失败
   notice_successful_update: 更新成功
+  notice_successful_edit: 修改成功
+  notice_failed_edit: 修改失败
   notice_successful_delete: 删除成功
   notice_failed_delete: 删除失败
   notice_successful_connection: 连接成功