From f08b75e5cab36ea0c95c65b76c2da7235bc41154 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 8 Aug 2023 08:07:58 +0100 Subject: [PATCH] tests --- app/models/validations/setup_validations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 78ece1d82..af2212e7e 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -223,6 +223,6 @@ private end def organisations_belong_to_same_merge?(organisation_a, organisation_b) - organisation_a.merge_date.present? && organisation_a.merge_date == organisation_b.merge_date && organisation_a.absorbing_organisation == organisation_b.absorbing_organisation + organisation_a&.merge_date.present? && organisation_b&.merge_date.present? && organisation_a.merge_date == organisation_b.merge_date && organisation_a.absorbing_organisation == organisation_b.absorbing_organisation end end