diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 8d1884fc2e..6e2c0dbeec 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -97,6 +97,8 @@ def validate_location(record) end def location_during_startdate_validation(record) + return unless date_valid?("startdate", record) + location_inactive_status = inactive_status(record.startdate, record.location) if location_inactive_status.present? @@ -108,6 +110,8 @@ def location_during_startdate_validation(record) end def scheme_during_startdate_validation(record) + return unless date_valid?("startdate", record) + scheme_inactive_status = inactive_status(record.startdate, record.scheme) if scheme_inactive_status.present?