diff --git a/app/components/lettings_log_summary_component.html.erb b/app/components/lettings_log_summary_component.html.erb index 5dcf6b280..7686e3559 100644 --- a/app/components/lettings_log_summary_component.html.erb +++ b/app/components/lettings_log_summary_component.html.erb @@ -33,13 +33,13 @@ <% if log.owning_organisation %>
Owned by
-
<%= organisation_label(log.owning_organisation) %>
+
<%= log.owning_organisation&.label %>
<% end %> <% if log.managing_organisation %>
Managed by
-
<%= organisation_label(log.managing_organisation) %>
+
<%= log.managing_organisation&.label %>
<% end %> diff --git a/app/components/lettings_log_summary_component.rb b/app/components/lettings_log_summary_component.rb index 886516612..995e53517 100644 --- a/app/components/lettings_log_summary_component.rb +++ b/app/components/lettings_log_summary_component.rb @@ -10,10 +10,4 @@ class LettingsLogSummaryComponent < ViewComponent::Base def log_status helpers.status_tag(log.status) end - - def organisation_label(organisation) - return unless organisation - - organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name - end end diff --git a/app/components/sales_log_summary_component.html.erb b/app/components/sales_log_summary_component.html.erb index fc6b0216d..1d376aa4a 100644 --- a/app/components/sales_log_summary_component.html.erb +++ b/app/components/sales_log_summary_component.html.erb @@ -26,13 +26,13 @@ <% if log.owning_organisation %>
Owned by
-
<%= organisation_label(log.owning_organisation) %>
+
<%= log.owning_organisation&.label %>
<% end %> <% if log.managing_organisation %>
Reported by
-
<%= organisation_label(log.managing_organisation) %>
+
<%= log.managing_organisation&.label %>
<% end %> diff --git a/app/components/sales_log_summary_component.rb b/app/components/sales_log_summary_component.rb index 637e1f2c8..07249ea6f 100644 --- a/app/components/sales_log_summary_component.rb +++ b/app/components/sales_log_summary_component.rb @@ -10,10 +10,4 @@ class SalesLogSummaryComponent < ViewComponent::Base def log_status helpers.status_tag(log.status) end - - def organisation_label(organisation) - return unless organisation - - organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name - end end diff --git a/app/models/organisation.rb b/app/models/organisation.rb index d56dd7afb..8f77df166 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -186,4 +186,8 @@ class Organisation < ApplicationRecord users.each(&:discard!) update!(discarded_at: Time.zone.now) end + + def label + status == :deleted ? "#{name} (deleted)" : name + end end