From 270999bd8105e981dadb94a1b71492710ae6a4f8 Mon Sep 17 00:00:00 2001 From: Kat <54268893+kosiakkatrina@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:39:04 +0000 Subject: [PATCH] Check if the date valid before running location validations --- app/models/validations/setup_validations.rb | 4 ++++ 1 file changed, 4 insertions(+) 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?