Browse Source

Refactor organisation label

pull/2459/head
Kat 2 years ago committed by kosiakkatrina
parent
commit
d1c398deb6
  1. 4
      app/components/lettings_log_summary_component.html.erb
  2. 6
      app/components/lettings_log_summary_component.rb
  3. 4
      app/components/sales_log_summary_component.html.erb
  4. 6
      app/components/sales_log_summary_component.rb
  5. 4
      app/models/organisation.rb

4
app/components/lettings_log_summary_component.html.erb

@ -33,13 +33,13 @@
<% if log.owning_organisation %> <% if log.owning_organisation %>
<div class="app-metadata__item"> <div class="app-metadata__item">
<dt class="app-metadata__term">Owned by</dt> <dt class="app-metadata__term">Owned by</dt>
<dd class="app-metadata__definition"><%= organisation_label(log.owning_organisation) %></dd> <dd class="app-metadata__definition"><%= log.owning_organisation&.label %></dd>
</div> </div>
<% end %> <% end %>
<% if log.managing_organisation %> <% if log.managing_organisation %>
<div class="app-metadata__item"> <div class="app-metadata__item">
<dt class="app-metadata__term">Managed by</dt> <dt class="app-metadata__term">Managed by</dt>
<dd class="app-metadata__definition"><%= organisation_label(log.managing_organisation) %></dd> <dd class="app-metadata__definition"><%= log.managing_organisation&.label %></dd>
</div> </div>
<% end %> <% end %>
</dl> </dl>

6
app/components/lettings_log_summary_component.rb

@ -10,10 +10,4 @@ class LettingsLogSummaryComponent < ViewComponent::Base
def log_status def log_status
helpers.status_tag(log.status) helpers.status_tag(log.status)
end end
def organisation_label(organisation)
return unless organisation
organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name
end
end end

4
app/components/sales_log_summary_component.html.erb

@ -26,13 +26,13 @@
<% if log.owning_organisation %> <% if log.owning_organisation %>
<div class="app-metadata__item"> <div class="app-metadata__item">
<dt class="app-metadata__term">Owned by</dt> <dt class="app-metadata__term">Owned by</dt>
<dd class="app-metadata__definition"><%= organisation_label(log.owning_organisation) %></dd> <dd class="app-metadata__definition"><%= log.owning_organisation&.label %></dd>
</div> </div>
<% end %> <% end %>
<% if log.managing_organisation %> <% if log.managing_organisation %>
<div class="app-metadata__item"> <div class="app-metadata__item">
<dt class="app-metadata__term">Reported by</dt> <dt class="app-metadata__term">Reported by</dt>
<dd class="app-metadata__definition"><%= organisation_label(log.managing_organisation) %></dd> <dd class="app-metadata__definition"><%= log.managing_organisation&.label %></dd>
</div> </div>
<% end %> <% end %>
</dl> </dl>

6
app/components/sales_log_summary_component.rb

@ -10,10 +10,4 @@ class SalesLogSummaryComponent < ViewComponent::Base
def log_status def log_status
helpers.status_tag(log.status) helpers.status_tag(log.status)
end end
def organisation_label(organisation)
return unless organisation
organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name
end
end end

4
app/models/organisation.rb

@ -186,4 +186,8 @@ class Organisation < ApplicationRecord
users.each(&:discard!) users.each(&:discard!)
update!(discarded_at: Time.zone.now) update!(discarded_at: Time.zone.now)
end end
def label
status == :deleted ? "#{name} (deleted)" : name
end
end end

Loading…
Cancel
Save