From 9e83ee3ca4546dd7771059ba3aeb5a2e20d0e2f8 Mon Sep 17 00:00:00 2001
From: Yanjun Li <yanjun.li@bywatersolutions.com>
Date: Thu, 24 Oct 2024 20:51:12 +0000
Subject: [PATCH] Bug 38020: Change form to submit link

To test:

1. Create a list in the staff interface
2. Go to lists
3. View the list
4. Click the Edit dropdown
5. Notice the two dropdown options for Edit list and Delete list have different formatting and look different
6. Apply patch
7. Try steps 1 through 4 again
8. The delete list button form looks right, and delete function works

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit d3488291f63195ec0291009b7cb0919a5679c279)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/en/includes/virtualshelves-toolbar.inc        | 10 +++-------
 .../prog/en/modules/virtualshelves/shelves.tt          |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
index 2ce1ccd503..0791f3fd41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
@@ -16,13 +16,9 @@
             <ul class="dropdown-menu">
                 <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;referer=[% op | uri %]">Edit list</a></li>
                 <li>
-                    <form id="deleteshelf_toolbar_form" action="shelves.pl" method="post">
-                        [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op" value="cud-delete" />
-                        <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
-                        <button type="submit" class="btn btn-default delete-list">Delete list</button>
-                    </form>
-                </li>
+                    [% INCLUDE 'csrf-token.inc' %]
+                    <a class="submit-form-link dropdown-item" href="#" data-shelfnumber="[% shelf.shelfnumber | html %]" data-method="post" data-action="shelves.pl" data-op="cud-delete" data-confirmation-msg="[% t('Are you sure you want to delete this list?') | html %]">Delete List</a>
+               </li>
             </ul>
         </div>
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index e82cf2f618..e0624410fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -599,6 +599,7 @@
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
     [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
+    [% Asset.js("js/form-submit.js") | $raw %]
     [% IF print %]
         <script>
             $( document ).ready(function() {