From 62d9f73e9e3bfe7fbca1340c753b75c951aceaf1 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 15 Feb 2024 09:13:15 +0000
Subject: [PATCH] Bug 34478: Changes for authorities/searchresultlist (new
 delete form)

Replaces a delete with GET.
FIXME: Trouble with closing dropdown.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/authorities_js.inc       | 31 ++++++-------------
 .../modules/authorities/searchresultlist.tt   | 19 +++++++++++-
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
index b363ba106c..9b2ca85c9b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
@@ -32,30 +32,17 @@ function showMergingInProgress() {
     }
 }
 
-function confirm_deletion(id) {
-    var is_confirmed = confirm(_("Are you sure you want to delete this authority?"));
-    if( !id ){
-        id = "[% authid | html %]";
-    }
-    if (is_confirmed) {
-      window.location="authorities-home.pl?op=delete"
-          + "&authid=" + id
-          + "&type=intranet"
-          + "&authtypecode=[% authtypecode | html %]"
-          + "&marclist=[% marclist | html %]"
-          + "&and_or=[% and_or | html %]"
-          + "&excluding=[% excluding | html %]"
-          + "&operator=[% operator | html %]"
-          + "&orderby=[% orderby | html %]"
-          + "&value=[% value |uri %]"
-          + "&startfrom=[% startfrom | html %]"
-          + "&resultsperpage=[% resultsperpage | html %]"
-          + "&csrf_token=[% csrf_token | html %]";
-    }
-}
-
 $(document).ready(function () {
     showMergingInProgress();
+
+    $('.form_delete').submit(function() {
+        if ( confirm(_("Are you sure you want to delete this authority?")) ) {
+            return true;
+        }
+        // FIXME Close the dropdown $(this).closest('ul.dropdown-menu').dropdown('toggle');
+        return false;
+    });
+
     $('.merge_auth').click(function (event) {
         event.preventDefault();
         mergeAuth($(this).parents('tr').attr('data-authid'), $(this).parents('tr').find('div.authorizedheading').text());
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
index 4862e5e81c..28e9d1d0d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
@@ -110,7 +110,24 @@
               <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a></li>
               <li><a class="merge_auth" href="#merge"><i class="fa fa-compress"></i> Merge</a></li>
               [% UNLESS ( resul.used ) %]
-                <li><a onclick='return confirm_deletion("[% resul.authid | html %]")'><i class="fa fa-trash-can"></i> Delete</a></li>
+                  <li><form class="form_delete" method="post" action="/cgi-bin/koha/authorities/authorities-home.pl">
+                      [% INCLUDE 'csrf-token.inc' %]
+                      <input type="hidden" name="op" value="cud-delete" />
+                      <input type="hidden" name="authid" value="[% resul.authid | html %]" />
+                      <input type="hidden" name="type" value="intranet" />
+                      <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
+                      <input type="hidden" name="marclist" value="[% marclist | html %]" />
+                      <input type="hidden" name="and_or" value="[% and_or | html %]" />
+                      <input type="hidden" name="excluding" value="[% excluding | html %]" />
+                      <input type="hidden" name="operator" value="[% operator | html %]" />
+                      <input type="hidden" name="orderby" value="[% orderby | html %]" />
+                      <input type="hidden" name="value" value="[% value | uri %]" />
+                      <input type="hidden" name="startfrom" value="[% startfrom | html %]" />
+                      <input type="hidden" name="resultsperpage" value="[% resultsperpage | html %]" />
+                      <fieldset class="action">
+                          <input type="submit" class="btn btn-primary" value="Delete" />
+                      </fieldset>
+                  </form></li>
               [% END %]
               <li class="authority_preview">
                 <a data-authid="[% resul.authid | html %]" href="/cgi-bin/koha/authorities/detail.pl?authid=[% resul.authid | uri %]"><i class="fa-solid fa-eye"></i> MARC preview</a>
-- 
2.39.5