From e79690ff8ab18304efc9e6c1396055da5b0dd2e3 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 21 Jun 2024 15:10:05 +0000
Subject: [PATCH] Bug 36557: (follow-up) Restore missing "Remove from list"
 control

This patch restores the "Remove from list" control to the batch
operations toolbar when one is looking at the contents of a list. It was
unintentionally left out of the previous patch.

The patch also corrects some button markup to ensure consisten style of
controls in the batch operations toolbar.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../bootstrap/en/includes/result-batch-controls.inc    | 10 +++++++++-
 .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt     |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/result-batch-controls.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/result-batch-controls.inc
index eed84b5736..8e9e7d5bbe 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/result-batch-controls.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/result-batch-controls.inc
@@ -23,7 +23,9 @@
 
         [% IF ( CartEnabled ) %]
             <div class="btn-group">
-                <a id="addtocart" class="btn btn-link btn-xs" href="#"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Add to cart</a>
+                <button id="addtocart" class="btn btn-link btn-xs">
+                    <i class="fa fa-shopping-cart" aria-hidden="true"></i> Add to cart
+                </button>
             </div>
         [% END %]
 
@@ -62,6 +64,12 @@
                     <a href="#" class="dropdown-item addtolist newlist">New list</a>
                 </div>
             </div>
+            [% IF loggedinusername && can_remove_biblios %]
+                <button class="btn btn-link btn-sm disabled removeitems tag_hides">
+                    <i class="fa fa-fw fa-remove" aria-hidden="true"></i> Remove from list</button>
+                </button>
+            [% END %]
+
         [% END # /IF virtualshelves %]
 
         [% IF ( MultiHolds ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 1d70e788fe..d1fc75c883 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -964,8 +964,14 @@ $(function() {
                 });
             }
         });
-
+        $("body").on("hidden.bs.modal", "#bootstrap-confirm-box-modal", function(){
+            /* If the user clicked a single "Remove from list" link, uncheck the checkbox */
+            if( single_bib ){
+                selected_titles.prop("checked", false );
+            }
+        });
     [% END %]
+
     [% IF OpenLibraryCovers %]KOHA.OpenLibrary.GetCoverFromIsbn();[% END %]
     [% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]
     [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
-- 
2.39.5