From acb8cb60818d0dd348e10b1bac1097dcb185c07e Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:07:59 +0100
Subject: [PATCH] Add cancel link text to other questions

---
 app/views/merge_requests/merge_date.html.erb            | 6 ++++--
 app/views/merge_requests/merging_organisations.html.erb | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/merge_requests/merge_date.html.erb b/app/views/merge_requests/merge_date.html.erb
index 6766cb552..90cb22159 100644
--- a/app/views/merge_requests/merge_date.html.erb
+++ b/app/views/merge_requests/merge_date.html.erb
@@ -17,8 +17,10 @@
         width: 20 do %>
       <% end %>
       <%= f.hidden_field :page, value: "merge_date" %>
-
-      <%= f.govuk_submit %>
+        <div class="govuk-button-group">
+          <%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>
+          <%= govuk_link_to(secondary_merge_request_link_text(request.query_parameters["referrer"]), merge_request_path(@merge_request)) %>
+        </div>
     <% end %>
   </div>
 </div>
diff --git a/app/views/merge_requests/merging_organisations.html.erb b/app/views/merge_requests/merging_organisations.html.erb
index f7dbeb378..fb4133889 100644
--- a/app/views/merge_requests/merging_organisations.html.erb
+++ b/app/views/merge_requests/merging_organisations.html.erb
@@ -4,7 +4,7 @@
   <%= govuk_back_link href: merge_request_organisation_path(id: @merge_request.requesting_organisation_id) %>
 <% end %>
 
-<%= form_with model: @merge_request, url: merging_organisations_merge_request_path, method: :patch do |f| %>
+<%= form_with model: @merge_request, url: merging_organisations_merge_request_path(referrer: request.query_parameters["referrer"]), method: :patch do |f| %>
   <%= f.govuk_error_summary %>
   <h2 class="govuk-heading-l">Which organisations are merging into <%= @merge_request.absorbing_organisation&.name %>?</h2>
 
@@ -38,7 +38,10 @@
     <%= form_with model: @merge_request, url: merge_request_path(id: @merge_request.id), method: :patch do |f| %>
       <% if @merge_request.merging_organisations.count.positive? %>
         <%= f.hidden_field :page, value: "merging_organisations" %>
-        <%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>
+        <div class="govuk-button-group">
+          <%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>
+          <%= govuk_link_to(secondary_merge_request_link_text(request.query_parameters["referrer"]), merge_request_path(@merge_request)) %>
+        </div>
       <% end %>
     <% end %>
   </div>