From f759c956ec517ce53e569657eb06d18c95a8f683 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Wed, 20 Jul 2016 21:57:32 +0000 Subject: [PATCH] Bug 16948: 'Return to batch item deletion' button should only show when there are items that could not be deleted To test: 1) Go to Tools --> Batch item deletion 2) Put in an item barcode and click Continue 3) Deselect the item (so that you don't actually delete it) and click Delete selected items 4) Notice there are two links that say 'Return to batch item deletion' - one as a link and one as a button. 5) Apply patch and refresh page. You may have to go back and resend the form 6) Button should be gone, only one link shows. 7) Check out the same item that you are testing with to a patron 8) Put the barcode into batch item deletion again and follow the prompts. Do not deselect it after clicking Continue this time. (It will not be deleted as it has been checked out). 9) After clicking Delete selected items, you should be redirected and see a table with the item in it and the reason it can't be deleted. The button and the link saying 'Return to batch item deletion' should both be present. Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index 8014d9e..55db372 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -186,11 +186,8 @@ $(document).ready(function(){ [% END %] - [% END %] - [% END %] -

[% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] Return to the record [% ELSIF src %] @@ -198,7 +195,9 @@ $(document).ready(function(){ [% ELSE %] Return to batch item deletion [% END %] -

+ [% END %] + [% END %] + [% END %] -- 2.8.1