Browse Source

CLDC-2498 Prevent non-support from editing org name

pull/1788/head
Jack S 3 years ago
parent
commit
8274e460ca
  1. 16
      app/helpers/organisation_helper.rb
  2. 1
      app/models/organisation.rb
  3. 5
      app/views/organisations/edit.html.erb
  4. 1
      app/views/organisations/show.html.erb

16
app/helpers/organisation_helper.rb

@ -8,4 +8,20 @@ module OrganisationHelper
current_organisation.name current_organisation.name
end end
end end
def organisation_name_row(user:, organisation:, summary_list:)
summary_list.row do |row|
row.key { "Name" }
row.value { organisation.name }
if user.support?
row.action(
visually_hidden_text: organisation.name.humanize.downcase,
href: edit_organisation_path(organisation),
html_attributes: { "data-qa": "change-#{organisation.name.downcase}" },
)
else
row.action
end
end
end
end end

1
app/models/organisation.rb

@ -104,7 +104,6 @@ class Organisation < ApplicationRecord
def display_organisation_attributes def display_organisation_attributes
[ [
{ name: "Name", value: name, editable: true },
{ name: "Organisation ID", value: "ORG#{id}", editable: false }, { name: "Organisation ID", value: "ORG#{id}", editable: false },
{ name: "Address", value: address_string, editable: true }, { name: "Address", value: address_string, editable: true },
{ name: "Telephone number", value: phone, editable: true }, { name: "Telephone number", value: phone, editable: true },

5
app/views/organisations/edit.html.erb

@ -11,8 +11,9 @@
<%= content_for(:title) %> <%= content_for(:title) %>
</h1> </h1>
<%= f.govuk_text_field :name, <% if current_user.support? %>
autocomplete: "name" %> <%= f.govuk_text_field :name, autocomplete: "name" %>
<% end %>
<%= f.govuk_text_field :address_line1, <%= f.govuk_text_field :address_line1,
label: { text: "Address line 1" }, label: { text: "Address line 1" },

1
app/views/organisations/show.html.erb

@ -14,6 +14,7 @@
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop"> <div class="govuk-grid-column-two-thirds-from-desktop">
<%= govuk_summary_list do |summary_list| %> <%= govuk_summary_list do |summary_list| %>
<%= organisation_name_row(user: current_user, organisation: @organisation, summary_list:) %>
<% @organisation.display_organisation_attributes.each do |attr| %> <% @organisation.display_organisation_attributes.each do |attr| %>
<% if can_edit_org?(current_user) && attr[:editable] %> <% if can_edit_org?(current_user) && attr[:editable] %>
<%= summary_list.row do |row| %> <%= summary_list.row do |row| %>

Loading…
Cancel
Save