From 938b974d772cb299084a48d7ced8f7446d1d9d22 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 11 Oct 2019 14:34:57 +0800
Subject: [PATCH 1/2] check commit_method
---
app/controllers/exercises_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index e76148f20..f74eefabf 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1078,6 +1078,7 @@ class ExercisesController < ApplicationController
ActiveRecord::Base.transaction do
begin
can_commit_exercise = false
+ Rails.logger.info("######____________params[:commit_method]_________################{params[:commit_method]}")
if (@user_course_identity > Course::ASSISTANT_PROFESSOR) && params[:commit_method].present? #为学生时
if params[:commit_method].to_i == 2 #自动提交时
user_left_time = get_exercise_left_time(@exercise,current_user)
From 369bbac497959b52fcc83168ccf56e6d3d82529d Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 11 Oct 2019 14:40:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/exercises_controller.rb | 2 +-
app/controllers/homework_commons_controller.rb | 2 +-
app/controllers/polls_controller.rb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index ac18754cd..3835baf55 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -689,7 +689,7 @@ class ExercisesController < ApplicationController
# 可立即发布的分班：当前用户管理的分班去除已发布的分班
group_ids = @course.charge_group_ids(@current_user) - @exercise.exercise_group_settings.exercise_group_published.pluck(:course_group_id)
@course_groups = @course.course_groups.where(id: group_ids)
- @group_settings = @exercise.exercise_group_settings.where(id: group_ids)
+ @group_settings = @exercise.exercise_group_settings.where(course_group_id: group_ids)
end
#首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 70f0345b1..9941e1d42 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -1036,7 +1036,7 @@ class HomeworkCommonsController < ApplicationController
# 可立即发布的分班：当前用户管理的分班去除已发布的分班
group_ids = @course.charge_group_ids(@current_user) - @homework.homework_group_settings.group_published.pluck(:course_group_id)
@course_groups = @course.course_groups.where(id: group_ids)
- @group_settings = @homework.homework_group_settings.where(id: group_ids)
+ @group_settings = @homework.homework_group_settings.where(course_group_id: group_ids)
else
tip_exception("没有可发布的分班")
end
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 6b9fd004c..2259907e4 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -249,7 +249,7 @@ class PollsController < ApplicationController
# 可立即发布的分班：当前用户管理的分班去除已发布的分班
group_ids = @course.charge_group_ids(@current_user) - @poll.poll_group_settings.poll_group_published.pluck(:course_group_id)
@course_groups = @course.course_groups.where(id: group_ids)
- @group_settings = @poll.poll_group_settings.where(id: group_ids)
+ @group_settings = @poll.poll_group_settings.where(course_group_id: group_ids)
end
#首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。