From 5a6a2514cac8c4b12098958651ca5a5709c15320 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 7 Sep 2018 13:39:16 +0000 Subject: [PATCH 1/2] Bump govuk_publishing_components from 9.16.1 to 9.18.0 Bumps [govuk_publishing_components](https://github.com/alphagov/govuk_publishing_components) from 9.16.1 to 9.18.0. - [Release notes](https://github.com/alphagov/govuk_publishing_components/releases) - [Changelog](https://github.com/alphagov/govuk_publishing_components/blob/master/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_publishing_components/compare/v9.16.1...v9.18.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 778226381..ef20014a4 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'gds-api-adapters', '~> 53.0' gem 'govuk_ab_testing', '~> 2.4' gem 'govuk_app_config', '~> 1.8' gem 'govuk_frontend_toolkit', '~> 7.6' -gem 'govuk_publishing_components', '~> 9.16.1' +gem 'govuk_publishing_components', '~> 9.18.0' gem 'plek', '~> 2.1' gem 'slimmer', '~> 13.0' diff --git a/Gemfile.lock b/Gemfile.lock index c548f440a..fc10ebf2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,7 +124,7 @@ GEM govuk_frontend_toolkit (7.6.0) railties (>= 3.1.0) sass (>= 3.2.0) - govuk_publishing_components (9.16.1) + govuk_publishing_components (9.18.0) govspeak (>= 5.0.3) govuk_app_config govuk_frontend_toolkit @@ -361,7 +361,7 @@ DEPENDENCIES govuk_ab_testing (~> 2.4) govuk_app_config (~> 1.8) govuk_frontend_toolkit (~> 7.6) - govuk_publishing_components (~> 9.16.1) + govuk_publishing_components (~> 9.18.0) govuk_schemas (~> 3.2) htmlentities (~> 4.3) jasmine-rails From b746575393e08921a7889381bee2efacc783945b Mon Sep 17 00:00:00 2001 From: Leena Gupte Date: Fri, 7 Sep 2018 15:36:57 +0100 Subject: [PATCH 2/2] Pass whole request object to publishing components In version 9.18.0, the constructor for Contextual Navigation was changed and now expects the whole request object to be passed. This is because Contextual Navigation also needs to check the values in The query string (if it exists) to see if the user is on a step by step journey. If they are, the content id of the step by step is being appended to the querystring. --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d193c1649..6802d0d17 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -39,7 +39,7 @@ <% if @content_item.try(:back_link) %> <%= render 'govuk_publishing_components/components/back_link', href: @content_item.back_link %> <% elsif show_new_navigation? %> - <% navigation = GovukPublishingComponents::Presenters::ContextualNavigation.new(@content_item.content_item.parsed_content, request.path) %> + <% navigation = GovukPublishingComponents::Presenters::ContextualNavigation.new(@content_item.content_item.parsed_content, request) %> <% if @tagged_taxons.present? || navigation.breadcrumbs.present? %>