From 0cb186a0f61a2931f53a598a9da87fb076949bf9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 27 Sep 2019 16:01:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/student_works_controller.rb | 2 +-
app/decorators/tiding_decorator.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index a4e08b90a..b7a6953a5 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -334,7 +334,7 @@ class StudentWorksController < ApplicationController
@work.update_attributes(update_time: Time.now)
# 补交附件时给评阅过作品的教师、助教发消息
- unless @work.student_works_scores.where.not(score: nil).where(reviewer_role: [1, 2]).pluck(user_id).uniq.blank?
+ unless @work.student_works_scores.where.not(score: nil).where(reviewer_role: [1, 2]).pluck(:user_id).uniq.blank?
ResubmitStudentWorkNotifyJob.perform_later(@homework.id, [current_user.id])
end
diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb
index 9dc439377..4003ffb94 100644
--- a/app/decorators/tiding_decorator.rb
+++ b/app/decorators/tiding_decorator.rb
@@ -135,7 +135,7 @@ module TidingDecorator
end
def delete_course_content
- I18n.t(locale_format) % container.name
+ I18n.t(locale_format) % belong_container.name
end
def delete_course_member_content
From 8bb8ba3eb543a4631176dd0d166c5c4ca7f90a9a Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 27 Sep 2019 16:02:01 +0800
Subject: [PATCH 2/2] change
---
app/controllers/exercises_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 28c011434..f2e8508f0 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -783,7 +783,7 @@ class ExercisesController < ApplicationController
# 首页批量或单独 立即截止，截止时间为当前时间
def end_exercise
- sleep(1)
+
ActiveRecord::Base.transaction do
begin
check_ids = Exercise.where(id:params[:check_ids])