From 987158b7f448c4d762c33046d820f8aff056d6aa Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Wed, 16 Mar 2022 09:58:16 +0000 Subject: [PATCH] Un-anger the cop --- app/helpers/content_helper.rb | 8 ++++---- app/views/content/page.html.erb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb index 08dc0b0cd..1f81e9a3c 100644 --- a/app/helpers/content_helper.rb +++ b/app/helpers/content_helper.rb @@ -3,12 +3,12 @@ module ContentHelper raw_content = File.read("app/views/content/#{page_name}.md") content_with_erb_tags_replaced = ApplicationController.renderer.render( inline: raw_content, - locals: locals + locals:, ) - @page_title = page_title || page_name.to_s.humanize - @page_content = GovukMarkdown.render(content_with_erb_tags_replaced).html_safe + page_title ||= page_name.to_s.humanize + page_content = GovukMarkdown.render(content_with_erb_tags_replaced).html_safe - render "content/page" + render "content/page", locals: { page_title:, page_content: } end end diff --git a/app/views/content/page.html.erb b/app/views/content/page.html.erb index 39acc46f9..87b59160e 100644 --- a/app/views/content/page.html.erb +++ b/app/views/content/page.html.erb @@ -1,9 +1,9 @@ -<%= content_for :title, @page_title %> +<%= content_for :title, page_title %>
-

<%= @page_title %>

+

<%= page_title %>

- <%= @page_content %> + <%= page_content %>