From eeecc5ad08a6a659786eb909dbfeaa520bc041e4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 15 Apr 2016 17:06:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E7=82=B9=E5=87=BB=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=B6=E4=B8=8D=E5=BA=94=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=BC=BA=E8=AF=84=E6=89=A3=E5=88=86=E7=9A=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb             |  2 +-
 app/views/student_work/_set_score_rule_detail.html.erb | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 36a48f2a3..cd7aa39bc 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -775,7 +775,7 @@ class StudentWorkController < ApplicationController
       @homework.save
     end
 
-    unless homework_detail_manual.absence_penalty.to_s == params[:absence_penalty].to_s
+    if params[:absence_penalty] && homework_detail_manual.absence_penalty.to_s != params[:absence_penalty].to_s
       homework_detail_manual.absence_penalty = params[:absence_penalty]
       if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
         work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
diff --git a/app/views/student_work/_set_score_rule_detail.html.erb b/app/views/student_work/_set_score_rule_detail.html.erb
index c8451e478..28ca9e785 100644
--- a/app/views/student_work/_set_score_rule_detail.html.erb
+++ b/app/views/student_work/_set_score_rule_detail.html.erb
@@ -4,10 +4,12 @@
     <span class="f14 fontGrey3 mr10">迟交扣分</span>
     <input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
   </div>
-  <div>
-    <span class="f14 fontGrey3 mr10">缺评扣分</span>
-    <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
-  </div>
+  <% if homework.anonymous_comment == 0 %>
+      <div>
+        <span class="f14 fontGrey3 mr10">缺评扣分</span>
+        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+      </div>
+  <% end %>
 
   <% if homework.homework_type == 2%>
       <div>

From 8611fbbdec41fc0cda238e17b499d12adf129445 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 15 Apr 2016 17:10:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=AD=E5=85=B3=E4=BA=8E=E5=AD=A6=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E6=8F=90=E7=A4=BA=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=B8=BA=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97=EF=BC=8C=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=B4=9F=E6=95=B0=E6=88=96=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=83=BD=E6=89=A7=E8=A1=8C=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=BA=94=E8=AF=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AA=E8=83=BD=E8=BE=93=E5=85=A5=E6=AD=A3=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/course.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index b5255f786..4e698e6f2 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -114,7 +114,7 @@ function regex_course_class_period()
     }
     else
     {
-        $("#course_class_period_notice").html("学时总数必须为数字");
+        $("#course_class_period_notice").html("学时总数必须为正整数");
         $("#course_class_period_notice").show();
         return false;
     }