Browse Source

feat: make skip links for new answers route to check_answers

pull/2362/head
natdeanlewissoftwire 2 years ago
parent
commit
f5f1bc38e6
  1. 4
      app/helpers/form_page_helper.rb
  2. 2
      app/views/form/page.html.erb

4
app/helpers/form_page_helper.rb

@ -37,13 +37,13 @@ module FormPageHelper
end end
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) if accessed_from_duplicate_logs?(referrer)
duplicate_log_set_path(log, original_log_id) duplicate_log_set_path(log, original_log_id)
elsif returning_to_question_page?(page, referrer) elsif returning_to_question_page?(page, referrer)
send(log.form.cancel_path(page, log), log) send(log.form.cancel_path(page, log), log)
else 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 end
end end

2
app/views/form/page.html.erb

@ -73,7 +73,7 @@
<div class="govuk-button-group"> <div class="govuk-button-group">
<% if !@page.interruption_screen? %> <% if !@page.interruption_screen? %>
<%= f.govuk_submit submit_button_text(@page, request.query_parameters["referrer"]) %> <%= 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 %> <% end %>
</div> </div>
</div> </div>

Loading…
Cancel
Save