From b4702f313d4623d4c774860bd3c81a8d1fe909c2 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 26 Jun 2024 17:23:08 +0100 Subject: [PATCH] Update more labels --- app/models/form/lettings/questions/managing_organisation.rb | 4 ++-- app/models/form/lettings/questions/stock_owner.rb | 2 +- app/models/form/sales/questions/managing_organisation.rb | 2 +- app/models/form/sales/questions/owning_organisation_id.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/form/lettings/questions/managing_organisation.rb b/app/models/form/lettings/questions/managing_organisation.rb index 65d9242c7..81847876e 100644 --- a/app/models/form/lettings/questions/managing_organisation.rb +++ b/app/models/form/lettings/questions/managing_organisation.rb @@ -17,7 +17,7 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question return opts unless log if log.managing_organisation.present? - org_value = log.managing_organisation.status == :deleted ? "#{log.managing_organisation.name} (deleted)" : log.managing_organisation.name + org_value = log.managing_organisation.label opts = opts.merge({ log.managing_organisation.id => org_value }) end @@ -76,7 +76,7 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question organisation = Organisation.find_by(id: log.managing_organisation_id) return unless organisation - organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name + organisation.label end private diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb index 13d71ffd9..daa042004 100644 --- a/app/models/form/lettings/questions/stock_owner.rb +++ b/app/models/form/lettings/questions/stock_owner.rb @@ -17,7 +17,7 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question return answer_opts unless log if log.owning_organisation_id.present? - org_value = log.owning_organisation.status == :deleted ? "#{log.owning_organisation.name} (deleted)" : log.owning_organisation.name + org_value = log.owning_organisation.label answer_opts[log.owning_organisation.id] = org_value end diff --git a/app/models/form/sales/questions/managing_organisation.rb b/app/models/form/sales/questions/managing_organisation.rb index f7166d907..03609233e 100644 --- a/app/models/form/sales/questions/managing_organisation.rb +++ b/app/models/form/sales/questions/managing_organisation.rb @@ -17,7 +17,7 @@ class Form::Sales::Questions::ManagingOrganisation < ::Form::Question return opts unless log if log.managing_organisation.present? - org_value = log.managing_organisation.status == :deleted ? "#{log.managing_organisation.name} (deleted)" : log.managing_organisation.name + org_value = log.managing_organisation.label opts = opts.merge({ log.managing_organisation.id => org_value }) end diff --git a/app/models/form/sales/questions/owning_organisation_id.rb b/app/models/form/sales/questions/owning_organisation_id.rb index 7589b2b46..669c43a0e 100644 --- a/app/models/form/sales/questions/owning_organisation_id.rb +++ b/app/models/form/sales/questions/owning_organisation_id.rb @@ -17,7 +17,7 @@ class Form::Sales::Questions::OwningOrganisationId < ::Form::Question return answer_opts unless log if log.owning_organisation_id.present? - org_value = log.owning_organisation.status == :deleted ? "#{log.owning_organisation.name} (deleted)" : log.owning_organisation.name + org_value = log.owning_organisation.label answer_opts[log.owning_organisation.id] = org_value end