From 762cd64b7f9057300fb0f51131fc97a62f656795 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 25 Mar 2020 21:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E5=92=8C=E9=97=AE=E5=8D=B7?=
=?UTF-8?q?=E7=9A=84=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83=E5=BC=B9=E6=A1=86?=
=?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/views/exercises/publish_groups.json.jbuilder | 2 +-
app/views/polls/publish_groups.json.jbuilder | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/exercises/publish_groups.json.jbuilder b/app/views/exercises/publish_groups.json.jbuilder
index 72cefdd1a..68cf95d2f 100644
--- a/app/views/exercises/publish_groups.json.jbuilder
+++ b/app/views/exercises/publish_groups.json.jbuilder
@@ -1,6 +1,6 @@
json.course_groups @course_groups do |group|
json.id group.id
json.name group.name
- json.end_time @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
+ json.end_time @exercise.unified_setting ? @exercise.end_time : @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
end
json.end_time @exercise.end_time
\ No newline at end of file
diff --git a/app/views/polls/publish_groups.json.jbuilder b/app/views/polls/publish_groups.json.jbuilder
index f63a2ea90..8cf49e959 100644
--- a/app/views/polls/publish_groups.json.jbuilder
+++ b/app/views/polls/publish_groups.json.jbuilder
@@ -1,6 +1,6 @@
json.course_groups @course_groups do |group|
json.id group.id
json.name group.name
- json.end_time @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
+ json.end_time @poll.unified_setting ? @poll.end_time : @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
end
json.end_time @poll.end_time
\ No newline at end of file