Add return value for Exercise#valid_submission_deadlines?
This commit is contained in:
@ -556,18 +556,23 @@ cause: %w[submit assess remoteSubmit remoteAssess]}).distinct
|
|||||||
private :valid_main_file?
|
private :valid_main_file?
|
||||||
|
|
||||||
def valid_submission_deadlines?
|
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?
|
if late_submission_deadline.present? && submission_deadline.blank?
|
||||||
errors.add(:late_submission_deadline,
|
errors.add(:late_submission_deadline,
|
||||||
I18n.t('activerecord.errors.models.exercise.late_submission_deadline_not_alone'))
|
I18n.t('activerecord.errors.models.exercise.late_submission_deadline_not_alone'))
|
||||||
|
valid = false
|
||||||
end
|
end
|
||||||
|
|
||||||
if submission_deadline.present? && late_submission_deadline.present? &&
|
if submission_deadline.present? && late_submission_deadline.present? &&
|
||||||
late_submission_deadline < submission_deadline
|
late_submission_deadline < submission_deadline
|
||||||
errors.add(:late_submission_deadline,
|
errors.add(:late_submission_deadline,
|
||||||
I18n.t('activerecord.errors.models.exercise.late_submission_deadline_not_before_submission_deadline'))
|
I18n.t('activerecord.errors.models.exercise.late_submission_deadline_not_before_submission_deadline'))
|
||||||
|
valid = false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
valid
|
||||||
end
|
end
|
||||||
private :valid_submission_deadlines?
|
private :valid_submission_deadlines?
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user