From 5bbcf095304efcbfd51d5684c9b3d2984452e2c9 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 15 Jan 2020 15:27:56 +0000
Subject: [PATCH] Bug 24423: Add biblionumber to modify items link
Content-Type: text/plain; charset=utf-8

To test:
- Find/create a bib with at least one item
- From detail.pl, use the checkboxes in the holdings table to select one or more items
- click the "Modify Selected Items" link just above the holdings table to take your item(s) to batch modification
- Change something and click save
- Observe that the Return to the Record link points to a url without a biblionumber: "/cgi-bin/koha/catalogue/detail.pl?biblionumber="
- Apply patch
- Repeat
- The link now works!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: David Nind <david@davidnind.com>

Bug 24423: Fix for deletion - cleanup accidental debug inclusiopm

To test:
Repeat prior test plan with 'Delete selected'

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 ++
 tools/batchMod.pl                                           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index a569a45638..870a80f8fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -874,6 +874,7 @@
                 if (itemnumbers.length > 0) {
                     var url = '/cgi-bin/koha/tools/batchMod.pl?op=show&del=1';
                     url += '&itemnumber=' + itemnumbers.join('&itemnumber=');
+                    url += '&biblionumber=[% biblionumber | uri %]';
                     url += '&src=CATALOGUING';
                     $('a.itemselection_action_delete').attr('href', url);
                 } else {
@@ -890,6 +891,7 @@
                 if (itemnumbers.length > 0) {
                     var url = '/cgi-bin/koha/tools/batchMod.pl?op=show';
                     url += '&itemnumber=' + itemnumbers.join('&itemnumber=');
+                    url += '&biblionumber=[% biblionumber | uri %]';
                     url += '&src=CATALOGUING';
                     $('a.itemselection_action_modify').attr('href', url);
                 } else {
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 65a25d1c7d..3da1efb80c 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -318,7 +318,7 @@ if ($op eq "show"){
             @notfounditemnumbers = grep { !exists $itemdata{$_} } @contentlist;
         }
     } else {
-        if (defined $biblionumber){
+        if (defined $biblionumber && !@itemnumbers){
             my @all_items = GetItemsInfo( $biblionumber );
             foreach my $itm (@all_items) {
                 push @itemnumbers, $itm->{itemnumber};
-- 
2.11.0