diff --git a/app/helpers/form_page_helper.rb b/app/helpers/form_page_helper.rb index dc471da1c..8b1310579 100644 --- a/app/helpers/form_page_helper.rb +++ b/app/helpers/form_page_helper.rb @@ -37,13 +37,13 @@ module FormPageHelper end end - def cancel_button_link(page, referrer, original_log_id, log) + def cancel_button_link(page, referrer, original_log_id, log, ignore_answered) if accessed_from_duplicate_logs?(referrer) duplicate_log_set_path(log, original_log_id) elsif returning_to_question_page?(page, referrer) send(log.form.cancel_path(page, log), log) else - page.skip_href(log) || send(log.form.next_page_redirect_path(page, log, current_user), log) + page.skip_href(log) || send(log.form.next_page_redirect_path(page, log, current_user, ignore_answered:), log) end end end diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index fffc22411..d1eb5071e 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -73,7 +73,7 @@
<% if !@page.interruption_screen? %> <%= f.govuk_submit submit_button_text(@page, request.query_parameters["referrer"]) %> - <%= govuk_link_to cancel_button_text(@page, request.query_parameters["referrer"]), cancel_button_link(@page, request.query_parameters["referrer"], request.query_parameters["original_log_id"], @log) %> + <%= govuk_link_to cancel_button_text(@page, request.query_parameters["referrer"]), cancel_button_link(@page, request.query_parameters["referrer"], request.query_parameters["original_log_id"], @log, ignore_answered: request.query_parameters["referrer"] == "check_answers_new_answer") %> <% end %>