From 83d2b8f5fde162a2d888d6ca7ef8b5f4e4941911 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Fri, 23 Jun 2023 22:01:42 +0200 Subject: [PATCH] Add return value for Exercise#valid_submission_deadlines? --- app/models/exercise.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/exercise.rb b/app/models/exercise.rb index abdbd7a0..35ebfdce 100644 --- a/app/models/exercise.rb +++ b/app/models/exercise.rb @@ -556,18 +556,23 @@ cause: %w[submit assess remoteSubmit remoteAssess]}).distinct private :valid_main_file? def valid_submission_deadlines? - return unless submission_deadline.present? || late_submission_deadline.present? + return true unless submission_deadline.present? || late_submission_deadline.present? + valid = true if late_submission_deadline.present? && submission_deadline.blank? errors.add(:late_submission_deadline, I18n.t('activerecord.errors.models.exercise.late_submission_deadline_not_alone')) + valid = false end if submission_deadline.present? && late_submission_deadline.present? && late_submission_deadline < submission_deadline errors.add(:late_submission_deadline, I18n.t('activerecord.errors.models.exercise.late_submission_deadline_not_before_submission_deadline')) + valid = false end + + valid end private :valid_submission_deadlines?