From 23f6941001a6a2f1b9839a312d777d0571d8dcb1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 6 Jul 2015 16:28:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=BF=9F=E4=BA=A4=E6=89=A3=E5=88=86=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A8=8B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb            | 9 +++++----
 .../_homework_detail_programing_form.html.erb            | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 3c3a42b69..7a3b2b6c2 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -136,7 +136,7 @@ class HomeworkCommonController < ApplicationController
     # @homework.course_id = @course.id
 
     #匿评作业相关属性
-    if @homework.homework_type == 1
+    if @homework.homework_type == 1 && @homework_detail_manual
       @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]
@@ -152,15 +152,15 @@ class HomeworkCommonController < ApplicationController
         end
         @homework_detail_manual.absence_penalty = params[:absence_penalty]
       end
-    else #不是匿评作业，缺评扣分为0分，每个作品的缺评扣分改为0分，防止某些作业在结束匿评之后改为普通作业
+    elsif @homework.homework_type == 0 #普通作业，缺评扣分为0分，每个作品的缺评扣分改为0分，防止某些作业在结束匿评之后改为普通作业
       @homework.student_works.where("absence_penalty != 0").each do |student_work|
         student_work.late_penalty = 0
         student_work.save
       end
-      @homework_detail_manual.absence_penalty = 0
+      @homework_detail_manual.absence_penalty = 0 if @homework_detail_manual
     end
 
-    if @homework.homework_type == 2 #编程作业
+    if @homework.homework_type == 2 && @homework_detail_programing #编程作业
       @homework_detail_programing.language = "C++"
       @homework_detail_programing.standard_code = params[:standard_code]
       homework_tests = @homework.homework_tests
@@ -293,6 +293,7 @@ class HomeworkCommonController < ApplicationController
   def find_homework
     @homework = HomeworkCommon.find params[:id]
     @homework_detail_manual = @homework.homework_detail_manual
+    @homework_detail_programing = @homework.homework_detail_programing
     @course = @homework.course
   rescue
     render_404
diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
index 6808f8cfe..399e8355e 100644
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -40,15 +40,16 @@
     <%= calendar_for('homework_publish_time')%>
     <div class="cl"></div>
   </li>
-  <div class="cl"></div>
 
-  <li style="display: none;">
+  <li>
     <label class="label02">迟交扣分：&nbsp;</label>
     <%= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
     <span class="fl mt5">&nbsp;分</span>
     <div class="cl"></div>
   </li>
 </ul><!--hwork_new_basic end--->
+
+<div class="cl"></div>
 <div class="hwork_new_set">
   <p class="fl ml20 f14 mb10 c_orange">编程评测设置</p>
   <div class="cl"></div>