exercise—setting

5 years ago · 96d4bbacb0
parent e9cc7b9e30
commit 96d4bbacb0
1 changed files with 2 additions and 2 deletions
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@ -529,12 +529,12 @@ class ExercisesController < ApplicationController
                  if the_group_setting_status == 2
                    ex_group_params = {
                      :publish_time => the_group_setting.publish_time,
-                      :end_time => exercise_end_time
+                      :end_time => exercise_end_time < Time.now ? the_group_setting.end_time : exercise_end_time
                    }
                  elsif the_group_setting_status == 3
                    ex_group_params = {
                      :publish_time => the_group_setting.publish_time,
-                      :end_time => the_group_setting.end_time
+                      :end_time => exercise_end_time
                    }
                  end
                  the_group_setting.update_attributes!(ex_group_params)