From 5ef47bac52d64a1df5e41e4992d9fd7a6a2b4189 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 17 Feb 2022 10:39:12 +0000 Subject: [PATCH] Move validation --- app/models/validations/household_validations.rb | 3 --- app/models/validations/property_validations.rb | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 7e3847a03..6849c79fe 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -74,9 +74,6 @@ module Validations::HouseholdValidations end def validate_referral(record) - if record.rsnvac == "Re-let to tenant who occupied same property as temporary accommodation" && REFERRAL_INVALID_TMP.include?(record.referral) - record.errors.add :referral, I18n.t("validations.household.referral.rsnvac_non_temp") - end if record.tenancy == "Secure (including flexible)" && record.referral.present? && record.referral != "Internal transfer" record.errors.add :referral, I18n.t("validations.household.referral.secure_tenancy") end diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb index ef09a56e2..fa79798ae 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -47,6 +47,7 @@ module Validations::PropertyValidations if record.rsnvac == "Re-let to tenant who occupied same property as temporary accommodation" && REFERRAL_INVALID_TMP.include?(record.referral) record.errors.add :rsnvac, I18n.t("validations.property.rsnvac.referral_invalid") + record.errors.add :referral, I18n.t("validations.household.referral.rsnvac_non_temp") end end