From 88f5c0e8e09a3200c2767b4cfde8cd298ff7ab56 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Tue, 5 Mar 2024 12:25:54 +0000 Subject: [PATCH] CLDC-2692: Use Home as the root of all breadcrumbs --- app/helpers/form_page_helper.rb | 2 ++ app/helpers/review_helper.rb | 2 ++ app/views/form/check_answers.html.erb | 1 + app/views/locations/index.html.erb | 1 + app/views/logs/edit.html.erb | 1 + app/views/schemes/show.html.erb | 1 + app/views/users/show.html.erb | 1 + 7 files changed, 9 insertions(+) diff --git a/app/helpers/form_page_helper.rb b/app/helpers/form_page_helper.rb index e72f12da9..501872ed6 100644 --- a/app/helpers/form_page_helper.rb +++ b/app/helpers/form_page_helper.rb @@ -14,12 +14,14 @@ module FormPageHelper def form_page_breadcrumbs(current_user, log, subsection, query_parameters) if accessed_from_duplicate_logs?(query_parameters["referrer"]) content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, breadcrumb_logs_title(log, current_user) => breadcrumb_logs_link(log, current_user), "Duplicate Logs" => duplicate_logs_path, "Duplicates of Log #{log.id}" => send("#{log.class.name.underscore}_duplicate_logs_path", log, original_log_id: query_parameters["original_log_id"]), }) else content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, breadcrumb_logs_title(log, current_user) => breadcrumb_logs_link(log, current_user), "Log #{log.id}" => url_for(log), subsection.label => send("#{log.class.name.underscore}_#{subsection.id}_check_answers_path", log), diff --git a/app/helpers/review_helper.rb b/app/helpers/review_helper.rb index 149a62060..87fb691eb 100644 --- a/app/helpers/review_helper.rb +++ b/app/helpers/review_helper.rb @@ -13,10 +13,12 @@ module ReviewHelper def review_breadcrumbs(log) if log.collection_closed_for_editing? content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, breadcrumb_logs_title(log, current_user) => breadcrumb_logs_link(log, current_user), }) else content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, breadcrumb_logs_title(log, current_user) => breadcrumb_logs_link(log, current_user), "Log #{log.id}" => url_for(log), }) diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb index 6cba1a547..cb6e0b6fd 100644 --- a/app/views/form/check_answers.html.erb +++ b/app/views/form/check_answers.html.erb @@ -1,5 +1,6 @@ <% content_for :title, "#{subsection.id.humanize} - Check your answers" %> <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, breadcrumb_logs_title(@log, current_user) => breadcrumb_logs_link(@log, current_user), "Log #{@log.id}" => url_for(@log) }) %> diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb index 37c391c68..88b17321e 100644 --- a/app/views/locations/index.html.erb +++ b/app/views/locations/index.html.erb @@ -4,6 +4,7 @@ <% if current_user.support? %> <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, "Schemes (#{@scheme.owning_organisation.name})" => schemes_organisation_path(@scheme.owning_organisation), content_for(:title) => scheme_path(@scheme), }) %> diff --git a/app/views/logs/edit.html.erb b/app/views/logs/edit.html.erb index 4e874bdf4..a32906e37 100644 --- a/app/views/logs/edit.html.erb +++ b/app/views/logs/edit.html.erb @@ -1,5 +1,6 @@ <% content_for :title, "Log #{@log.id}" %> <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, breadcrumb_logs_title(@log, current_user) => breadcrumb_logs_link(@log, current_user) }) %> diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb index 9d07989cc..c45cefb14 100644 --- a/app/views/schemes/show.html.erb +++ b/app/views/schemes/show.html.erb @@ -3,6 +3,7 @@ <% if current_user.support? %> <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, "Schemes (#{@scheme.owning_organisation.name})" => schemes_organisation_path(@scheme.owning_organisation), }) %> <% else %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d06d6c76d..a8f12cd36 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,6 +2,7 @@ <% if current_user.support? %> <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { + "Home" => root_path, "Users (#{@user.organisation.name})" => users_organisation_path(@user.organisation), }) %> <% else %>