Merge remote-tracking branch 'origin/CLDC-2670-redirect-to-follow-up-questions' into CLDC-2670-redirect-to-follow-up-questions

# Conflicts: # app/helpers/form_page_helper.rb
2 years ago · 34a24350e0
1 changed files with 1 additions and 1 deletions
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@ -73,7 +73,7 @@
      <div class="govuk-button-group">
      <% 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 %>
      </div>
    </div>