diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 286409759..847318fb1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,7 +34,7 @@ module ApplicationHelper def sanitise_characters(string) return string unless string - string.gsub("'", "’").gsub("&", "and") + string.gsub("'", "’").gsub("&", "&") end private diff --git a/app/views/organisations/_merged_organisation_details.html.erb b/app/views/organisations/_merged_organisation_details.html.erb index 020051156..72ec9b213 100644 --- a/app/views/organisations/_merged_organisation_details.html.erb +++ b/app/views/organisations/_merged_organisation_details.html.erb @@ -1,5 +1,5 @@ <% if @organisation.organisations_absorbed_during_displayed_collection_period_grouped_by_merge_date.present? %> - <%= govuk_details(summary_text: "View all organisations that were merged into #{@organisation.name}") do %> + <%= govuk_details(summary_text: "View all organisations that were merged into #{sanitise_characters(@organisation.name)}") do %> <% @organisation.organisations_absorbed_during_displayed_collection_period_grouped_by_merge_date.each do |merge_date, organisations| %>
Merge date: <%= merge_date&.to_formatted_s(:govuk_date) %>
<%= govuk_table do |table| %> diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb index b0bd05bf6..7718dbea4 100644 --- a/app/views/organisations/edit.html.erb +++ b/app/views/organisations/edit.html.erb @@ -1,4 +1,4 @@ -<% content_for :title, "Change #{@organisation.name}’s details" %> +<% content_for :title, "Change #{sanitise_characters(@organisation.name)}’s details" %> <% content_for :before_content do %> <%= govuk_back_link(href: :back) %> @@ -8,7 +8,7 @@