From a762602cd6b433aafef5fefa8e5d9eb3ef2601c6 Mon Sep 17 00:00:00 2001 From: Ted Date: Mon, 27 Jun 2022 14:52:51 +0100 Subject: [PATCH] For in progress logs the "Skip for now" button is replaced with a "Cancel" button which redirects to the setup page --- app/views/form/page.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index 8f18146d6..d483a7093 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -39,11 +39,17 @@ <% end %> <%= f.hidden_field :page, value: @page.id %> - <% next_page = @case_log.form.next_page(@page, @case_log, current_user) %> - <% if !@page.id.include?("value_check") %> - <%= f.govuk_submit "Save and continue" %> - <%= govuk_link_to "Skip for now", "/logs/#{@case_log.id}/#{next_page.dasherize}", secondary: true %> + +
+ <% if !@page.id.include?("value_check") %> + <%= f.govuk_submit "Save and continue" %> + <% if request.query_parameters["referrer"] == "check_answers" %> + <%= govuk_link_to "Cancel", "/logs/#{@case_log.id}/setup/check-answers" %> + <% else %> + <%= govuk_link_to "Skip for now", send(@case_log.form.next_page_redirect_path(@page, @case_log, current_user), @case_log) %> + <% end %> <% end %> +
<% end %>