From cee85d7a5a2435a40cd9e130fb4b55d2d7492651 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 27 Feb 2024 14:19:18 +0100
Subject: [PATCH] Bug 34478: Fix saveitem and delete for additem

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 cataloguing/additem.pl                          |  6 +++---
 .../prog/en/modules/cataloguing/additem.tt      | 17 +++++++++++++----
 .../intranet-tmpl/prog/js/cataloging_additem.js | 10 ++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index ea384f59f2..affbf89ee5 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -486,7 +486,7 @@ if ($op eq "cud-additem") {
 #-------------------------------------------------------------------------------
 # retrieve item if exist => then, it's a modif
     $current_item = Koha::Items->find($itemnumber)->unblessed;
-    $nextop       = "saveitem";
+    $nextop       = "cud-saveitem";
 #-------------------------------------------------------------------------------
 } elsif ($op eq "dupeitem") {
 #-------------------------------------------------------------------------------
@@ -502,7 +502,7 @@ if ($op eq "cud-additem") {
 
     $nextop = "cud-additem";
 #-------------------------------------------------------------------------------
-} elsif ($op eq "delitem") {
+} elsif ($op eq "cud-delitem") {
 #-------------------------------------------------------------------------------
     # check that there is no issue on this item before deletion.
     my $item = Koha::Items->find($itemnumber);
@@ -547,7 +547,7 @@ if ($op eq "cud-additem") {
         exit;
     }
 #-------------------------------------------------------------------------------
-} elsif ($op eq "saveitem") {
+} elsif ($op eq "cud-saveitem") {
 #-------------------------------------------------------------------------------
 
     my $itemnumber = $input->param('itemnumber');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 1cf3bcb028..ae409d5270 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -136,7 +136,16 @@
                                 <li><a href="additem.pl?op=dupeitem&amp;biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;searchid=[% searchid | uri %]#additema">Duplicate</a></li>
                                 <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&amp;number_type=itemnumber&amp;number_list=[% item.itemnumber | uri %]" target="_blank" >Print label</a></li>
                                 [% UNLESS item.nomod %]
-                                    <li><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=[% item.biblionumber | html %]&amp;itemnumber=[% item.itemnumber | html %]&amp;searchid=[% searchid | html %]" onclick="return confirm_deletion();">Delete</a></li>
+                                    <li>
+                                        <form action="/cgi-bin/koha/cataloguing/additem.pl" method="post">
+                                            [% INCLUDE 'csrf-token.inc' %]
+                                            <input type="hidden" name="op" value="cud-delitem" />
+                                            <input type="hidden" name="biblionumber" value="[% item.biblionumber | html %]" />
+                                            <input type="hidden" name="itemnumber" value="[% item.itemnumber | html %]" />
+                                            <input type="hidden" name="searchid" value="[% searchid | html %]" />
+                                        </form>
+                                        <a class="delete" href="#">Delete</a>
+                                    </li>
                                 [% END %]
                             [% END %]
                                 [% IF ( OPACBaseURL ) %]
@@ -182,7 +191,7 @@
         <input type="hidden" name="popup" value="1" />
     [% END %]
     <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]" />
-    [% IF op != 'saveitem' %]
+    [% IF op != 'cud-saveitem' %]
         <h2 id="additema">Add item [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %]</h2>
     [% ELSE %]
         <h2 id="edititem">Edit item #[% itemnumber | html %][% IF ( barcode ) %] / Barcode [% barcode | html %][% END %]</h2>
@@ -251,7 +260,7 @@
         <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
     [% END %]
 
-[% IF item_groups.size && op != 'saveitem' && CAN_user_editcatalogue_manage_item_groups %]
+[% IF item_groups.size && op != 'cud-saveitem' && CAN_user_editcatalogue_manage_item_groups %]
     <fieldset class="rows">
         <legend><i class="fa fa-plus"></i> Add to item group</legend>
         [% FOREACH ig IN item_groups %]
@@ -280,7 +289,7 @@
     </fieldset>
 [% END %]
 
-<fieldset class="action">    [% IF op != 'saveitem' %]
+<fieldset class="action">    [% IF op != 'cud-saveitem' %]
     <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
     <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items
 		when pressing the enter key, while in fact it is the first submit button that is validated, in our case the "add (single) item" button.
diff --git a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js b/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js
index 2957253d0c..d15fbfa593 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js
@@ -134,6 +134,12 @@ $(document).ready(function(){
         });
     }
 
+    $(".delete").on("click", function(e){
+        e.preventDefault();
+        if ( confirmDelete(MSG_CONFIRM_DELETE_ITEM) ) {
+            return $(this).siblings('form').submit();
+        }
+    });
 });
 
 function CheckTemplateForm(f) {
@@ -199,7 +205,3 @@ function Dopop(link,i) {
     var defaultvalue=document.forms[0].field_value[i].value;
     var newin=window.open(link+"&result=" + defaultvalue,"valuebuilder",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
-
-function confirm_deletion() {
-    return confirm( MSG_CONFIRM_DELETE_ITEM );
-}
-- 
2.39.2