Browse Source

Update back buttons

pull/2578/head
Kat 2 years ago
parent
commit
7e59d40a42
  1. 15
      app/helpers/merge_requests_helper.rb
  2. 2
      app/views/merge_requests/absorbing_organisation.html.erb
  3. 2
      app/views/merge_requests/helpdesk_ticket.html.erb
  4. 2
      app/views/merge_requests/merge_date.html.erb
  5. 2
      app/views/merge_requests/merging_organisations.html.erb

15
app/helpers/merge_requests_helper.rb

@ -53,4 +53,19 @@ module MergeRequestsHelper
def accessed_from_check_answers?(referrer)
%w[check_answers].include?(referrer)
end
def merge_request_back_link(merge_request, page, referrer)
return merge_request_path(merge_request) if accessed_from_check_answers?(referrer)
case page
when "absorbing_organisation"
organisations_path(anchor: "merge-requests")
when "merging_organisations"
absorbing_organisation_merge_request_path(merge_request)
when "merge_date"
merging_organisations_merge_request_path(merge_request)
when "helpdesk_ticket"
merge_date_merge_request_path(merge_request)
end
end
end

2
app/views/merge_requests/absorbing_organisation.html.erb

@ -1,7 +1,7 @@
<% content_for :before_content do %>
<% title = "Tell us if your organisation is merging" %>
<% content_for :title, title %>
<%= govuk_back_link href: organisations_path(anchor: "merge-requests") %>
<%= govuk_back_link href: merge_request_back_link(@merge_request, "absorbing_organisation", request.query_parameters["referrer"]) %>
<% end %>
<%= form_with model: @merge_request, url: merge_request_path, method: :patch do |f| %>

2
app/views/merge_requests/helpdesk_ticket.html.erb

@ -1,7 +1,7 @@
<% content_for :before_content do %>
<% title = "Which helpdesk ticket reported this merge?" %>
<% content_for :title, title %>
<%= govuk_back_link href: merge_date_merge_request_path(@merge_request) %>
<%= govuk_back_link href: merge_request_back_link(@merge_request, "helpdesk_ticket", request.query_parameters["referrer"]) %>
<% end %>
<%= form_with model: @merge_request, url: merge_request_path, method: :patch do |f| %>

2
app/views/merge_requests/merge_date.html.erb

@ -1,7 +1,7 @@
<% content_for :before_content do %>
<% title = "Tell us if your organisation is merging" %>
<% content_for :title, title %>
<%= govuk_back_link href: merging_organisations_merge_request_path(@merge_request) %>
<%= govuk_back_link href: merge_request_back_link(@merge_request, "merge_date", request.query_parameters["referrer"]) %>
<% end %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop">

2
app/views/merge_requests/merging_organisations.html.erb

@ -1,7 +1,7 @@
<% content_for :before_content do %>
<% title = "Tell us if your organisation is merging" %>
<% content_for :title, title %>
<%= govuk_back_link href: merge_request_organisation_path(id: @merge_request.requesting_organisation_id) %>
<%= govuk_back_link href: merge_request_back_link(@merge_request, "merging_organisations", request.query_parameters["referrer"]) %>
<% end %>
<%= form_with model: @merge_request, url: merging_organisations_merge_request_path(referrer: request.query_parameters["referrer"]), method: :patch do |f| %>

Loading…
Cancel
Save