From cf9a4097b7fa1890f828370dbb6996fb6da8a3d1 Mon Sep 17 00:00:00 2001 From: oscric Date: Tue, 11 Aug 2026 10:32:27 +0100 Subject: [PATCH] Small refactors --- app/models/derived_variables/lettings_log_variables.rb | 4 ++-- app/models/lettings_log.rb | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb index cdf146ae1..4b6ed27af 100644 --- a/app/models/derived_variables/lettings_log_variables.rb +++ b/app/models/derived_variables/lettings_log_variables.rb @@ -181,8 +181,6 @@ module DerivedVariables::LettingsLogVariables self.la = nil end - clear_gender_description_unless_gender_not_same_as_sex! if form.start_year_2026_or_later? - if scheme_has_confidential_information? reset_address_fields! self.uprn_selection = nil @@ -190,6 +188,8 @@ module DerivedVariables::LettingsLogVariables self.manual_address_entry_selected = nil end + clear_gender_description_unless_gender_not_same_as_sex! if form.start_year_2026_or_later? + set_checkbox_values! end diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index 7f3d44f56..909a0aebe 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -228,7 +228,7 @@ class LettingsLog < Log return super unless location return super if form.start_year_2026_or_later? && super - location_derived_la + location.linked_local_authorities.active(form.start_date).first&.code || location.location_code end def postcode_full @@ -849,12 +849,6 @@ class LettingsLog < Log private - def location_derived_la - return unless location - - location.linked_local_authorities.active(form.start_date).first&.code || location.location_code - end - def reset_invalid_unresolved_log_fields! return unless unresolved?