diff --git a/app/helpers/organisation_helper.rb b/app/helpers/organisation_helper.rb index c600f61da..68fa98242 100644 --- a/app/helpers/organisation_helper.rb +++ b/app/helpers/organisation_helper.rb @@ -8,9 +8,4 @@ module OrganisationHelper current_organisation.name end end - - DISPLAY_PROVIDER_TYPE = { "LA": "Local authority", "PRP": "Private registered provider" }.freeze - def display_provider_type(provider_type) - DISPLAY_PROVIDER_TYPE[provider_type.to_sym] - end end diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 6d22c303a..3d66b0a85 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -62,12 +62,18 @@ class Organisation < ApplicationRecord data_protection_confirmed? ? "Accepted" : "Not accepted" end + DISPLAY_PROVIDER_TYPE = { "LA": "Local authority", "PRP": "Private registered provider" }.freeze + + def display_provider_type + DISPLAY_PROVIDER_TYPE[provider_type.to_sym] + end + def display_attributes [ { name: "name", value: name, editable: true }, { name: "address", value: address_string, editable: true }, { name: "telephone_number", value: phone, editable: true }, - { name: "type", value: "Org type", editable: false }, + { name: "type", value: display_provider_type, editable: false }, { name: "local_authorities_operated_in", value: local_authority_names, editable: false, format: :bullet }, { name: "rent_periods", value: rent_period_labels, editable: false, format: :bullet }, { name: "holds_own_stock", value: holds_own_stock.to_s.humanize, editable: false }, diff --git a/app/views/organisations/_organisation_list.html.erb b/app/views/organisations/_organisation_list.html.erb index 591cedba7..78f60685d 100644 --- a/app/views/organisations/_organisation_list.html.erb +++ b/app/views/organisations/_organisation_list.html.erb @@ -28,7 +28,7 @@ <%= govuk_link_to(organisation.name, "organisations/#{organisation.id}/logs") %> <% end %> <% row.cell(text: organisation.housing_registration_no) %> - <% row.cell(text: display_provider_type(organisation.provider_type)) %> + <% row.cell(text: organisation.display_provider_type) %> <% end %> <% end %> <% end %>