From e734abe613c2962d453566ccefce1b94756835d3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 6 Jul 2015 10:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=A2=B3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 6b92e8198..3c3a42b69 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -133,19 +133,8 @@ class HomeworkCommonController < ApplicationController
       end
       @homework.late_penalty = params[:late_penalty]
     end
-    @homework.course_id = @course.id
+    # @homework.course_id = @course.id
 
-    @homework_detail_programing = @homework.homework_detail_programing
-    if @homework.homework_type == 2 #编程作业
-      @homework_detail_programing.language = "C++"
-      @homework_detail_programing.standard_code = params[:standard_code]
-      homework_tests = @homework.homework_tests
-      #需要删除的测试
-      ids = homework_tests.map(&:id) - params[:input].keys.map(&:to_i)
-      ids.each do |id|
-        homework_test = HomeworkTest.find id
-        homework_test.destroy if homework_test
-      end
     #匿评作业相关属性
     if @homework.homework_type == 1
       @homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
@@ -171,6 +160,16 @@ class HomeworkCommonController < ApplicationController
       @homework_detail_manual.absence_penalty = 0
     end
 
+    if @homework.homework_type == 2 #编程作业
+      @homework_detail_programing.language = "C++"
+      @homework_detail_programing.standard_code = params[:standard_code]
+      homework_tests = @homework.homework_tests
+      #需要删除的测试
+      ids = homework_tests.map(&:id) - params[:input].keys.map(&:to_i)
+      ids.each do |id|
+        homework_test = HomeworkTest.find id
+        homework_test.destroy if homework_test
+      end
       if params[:input] && params[:output]
         params[:input].each do |k,v|
           if params[:output].include? k
@@ -188,13 +187,6 @@ class HomeworkCommonController < ApplicationController
           end
         end
       end
-    else
-      #匿评作业相关属性
-      @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]
     end
 
     @homework.save_attachments(params[:attachments])