Merge pull request #8665 from alphagov/refactor-cancel-link-helper

Removed unnecessary cancel routes helper
alphagov · Dec 21, 2023 · 1fc644c · 1fc644c
2 parents cc2fbaa + dda9d2b
commit 1fc644c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 27 deletions.
diff --git a/app/helpers/admin/cancel_routes_helper.rb b/app/helpers/admin/cancel_routes_helper.rb
diff --git a/app/views/admin/edition_translations/confirm_destroy.html.erb b/app/views/admin/edition_translations/confirm_destroy.html.erb
@@ -14,7 +14,7 @@
         destructive: true,
       } %>
 
-      <%= link_to("Cancel", admin_cancel_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
+      <%= link_to("Cancel", admin_edition_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
     </div>
     <% end %>
   </section>

diff --git a/app/views/admin/edition_translations/edit.html.erb b/app/views/admin/edition_translations/edit.html.erb
@@ -72,7 +72,7 @@
           text: "Save",
         } %>
 
-        <%= link_to("Cancel", admin_cancel_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
+        <%= link_to("Cancel", admin_edition_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
       </div>
     <% end %>
   </section>

diff --git a/app/views/admin/editions/_save_or_continue_or_cancel.html.erb b/app/views/admin/editions/_save_or_continue_or_cancel.html.erb
@@ -22,5 +22,5 @@
     },
   } %>
 
-  <%= link_to "Cancel", admin_cancel_path(edition), class: "govuk-link govuk-link--no-visited-state" %>
+  <%= link_to "Cancel", edition.new_record? ? admin_editions_path : admin_edition_path(edition), class: "govuk-link govuk-link--no-visited-state" %>
 </div>
diff --git a/app/views/admin/editorial_remarks/confirm_destroy.html.erb b/app/views/admin/editorial_remarks/confirm_destroy.html.erb
@@ -14,7 +14,7 @@
           destructive: true,
         } %>
 
-        <%= link_to("Cancel", admin_cancel_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
+        <%= link_to("Cancel", admin_edition_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
       </div>
     <% end %>
   </section>

diff --git a/test/unit/app/helpers/admin/cancel_routes_helper_test.rb b/test/unit/app/helpers/admin/cancel_routes_helper_test.rb
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,5 +22,5 @@ @@
         },
       } %>
-      <%= link_to "Cancel", admin_cancel_path(edition), class: "govuk-link govuk-link--no-visited-state" %>
+      <%= link_to "Cancel", edition.new_record? ? admin_editions_path : admin_edition_path(edition), class: "govuk-link govuk-link--no-visited-state" %>
     </div>