From cb1f73b1bc3cdf56be5f44261621512dfa92c7cd Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 16 Feb 2024 14:18:06 +0000
Subject: [PATCH] Bug 34478: Corrections to add and delete of OAI sets

This patch makes two changes: The first changes the name of the op value
matched in the script when editing a set. The "mod" step is a GET
operation to load the edit form.

The second change is a workaround for the fact that a submit
button looks bad in a Bootstrap dropdown. The patch creates a hidden
form for deletion operations. Clicking a "delete" link in a dropdown
fills the hidden form with the OAI set id to be deleted and submits it.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/oai_sets.pl                             |  2 +-
 .../prog/en/modules/admin/oai_sets.tt         | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/admin/oai_sets.pl b/admin/oai_sets.pl
index fe611953a0..6e69eac652 100755
--- a/admin/oai_sets.pl
+++ b/admin/oai_sets.pl
@@ -55,7 +55,7 @@ if($op && $op eq "new") {
         name => $name,
         descriptions => \@descriptions
     });
-} elsif($op && $op eq "cud-mod") {
+} elsif($op && $op eq "mod") {
     my $id = $input->param('id');
     my $set = GetOAISet($id);
     $template->param(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
index f258097c41..3ccf6d187f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@@ -139,7 +139,7 @@
                                     Actions <b class="caret"></b></a>
                                     <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id | html %]">
                                     <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id | uri %]"><i class="fa-fw fa-solid fa-pencil" aria-hidden="true"></i> Edit</a></li>
-                                    <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id | html %]"><i class="fa fa-fw fa-trash-can"></i> Delete</a></li>
+                                    <li><a class="delete_oai_set" data-oai-set-id="[% set.id | html %]" href="#"><i class="fa fa-fw fa-trash-can"></i> Delete</a></li>
                                     <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | uri %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li>
                                     </ul>
                                 </div>
@@ -148,6 +148,11 @@
                         [% END %]
                     </tbody>
                 </table>
+                <form action="/cgi-bin/koha/admin/oai_sets.pl" id="oai_sets_delete" method="post">
+                    [% INCLUDE 'csrf-token.inc' %]
+                    <input type="hidden" name="op" value="cud-del" />
+                    <input type="hidden" id="oai_sets_id" name="id" value="" />
+                </form>
             </div> <!-- /.page-section -->
         [% ELSE %]
             <div class="dialog message"><p>There are no sets defined.</p></div>
@@ -181,13 +186,14 @@
             $(li).remove();
         }
 
-        function confirmDelete() {
-          return confirm(_("Are you sure you want to delete this OAI set?"));
-        }
-
         $(document).ready(function() {
-            $(".delete_oai_set").on("click",function(){
-                return confirmDelete();
+            $(".delete_oai_set").on("click",function(e){
+                e.preventDefault();
+                if( confirm(_("Are you sure you want to delete this OAI set?")) ){
+                    let oai_set_id = $(this).data("oai-set-id");
+                    $("#oai_sets_id").val( oai_set_id );
+                    $("#oai_sets_delete").submit();
+                }
             });
 
             $("body").on("click", ".remove_description", function(e){
-- 
2.39.5