From 8eb2c75cbc8775ed3dac5c3126579773d04d1dfc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 18 Sep 2015 11:29:58 +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?=E4=BF=AE=E6=94=B9=E8=AF=84=E5=88=86=E6=AF=94=E4=BE=8B=E4=B9=8B?=
=?UTF-8?q?=E5=90=8E=E6=88=90=E7=BB=A9=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=202=E3=80=81=E5=85=B3=E9=97=AD=E5=8C=BF=E8=AF=84=E4=B9=8B?=
=?UTF-8?q?=E5=90=8E=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/student_work_controller.rb | 13 +++++++++----
.../homework_common/stop_anonymous_comment.js.erb | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 866eecbd4..251fd80c4 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -370,6 +370,8 @@ class StudentWorkController < ApplicationController
student_work.late_penalty = @homework.late_penalty
student_work.save
end
+
+ @homework.save
end
unless homework_detail_manual.absence_penalty.to_s == params[:absence_penalty].to_s
@@ -382,6 +384,8 @@ class StudentWorkController < ApplicationController
student_work.save
end
end
+
+ homework_detail_manual.save if homework_detail_manual
end
teacher_priority = params[:teacher_priority] ? 1 : 0
@@ -389,15 +393,16 @@ class StudentWorkController < ApplicationController
homework_detail_manual.ta_proportion = params[:ta_proportion]
homework_detail_programing.ta_proportion = params[:sy_proportion] if homework_detail_programing
@homework.teacher_priority = teacher_priority
+
+ @homework.save
+ homework_detail_manual.save if homework_detail_manual
+ homework_detail_programing.save if homework_detail_programing
+
@homework.student_works.each do |student_work|
set_final_score @homework,student_work
student_work.save
end
end
-
- @homework.save
- homework_detail_manual.save if homework_detail_manual
- homework_detail_programing.save if homework_detail_programing
respond_to do |format|
format.html{redirect_to student_work_index_url(:homework => @homework.id)}
end
diff --git a/app/views/homework_common/stop_anonymous_comment.js.erb b/app/views/homework_common/stop_anonymous_comment.js.erb
index 70122c7ab..3cbac1bf6 100644
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@@ -1,2 +1,2 @@
-$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('匿评结束');
+$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('匿评结束');
alert('关闭成功');
\ No newline at end of file