Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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])

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
 

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