From 928c0af2b6a2c7aa6ed54019c5bd7dbddbccf4ee Mon Sep 17 00:00:00 2001 From: Aleisha Date: Tue, 16 Feb 2016 02:07:59 +0000 Subject: [PATCH] Bug 15824 - 'Done' button is unclear on batch item modification and deletion MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit EDIT: Making sure the messages and the buttons show the same text, as per Comment 6. To test: MODIFICATION 1) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1) 2) Click edit -> Edit items in a batch 3) Click Save (you don't need to make any changes) 4) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 5) Go to a biblio record page 6) Select one or some or all items in the record 7) Click modify selected items 8) Click Save 9) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 10) Go to batch item modification (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl) 11) Write some barcodes into the barcode list and click Continue 12) Click Save 13) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item mod page. DELETION 14) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1) 15) Click edit -> Delete items in a batch 16) Unselect all the items so you don't actually delete them, then click Delete selected items 17) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 18) Go to a biblio record page 19) Select one or some or all items in the record 20) Click Delete selected items 21) Unselect all the items so you don't actually delete them, then click Delete selected items 22) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 23) Go to batch item deletion (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl?del=1) 24) Write some barcodes into the barcode list and click Continue 25) Unselect all the items so you don't actually delete them, then click Delete selected items 26) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item deletion page. Signed-off-by: Owen Leonard Followed test plan, works as expected. Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../prog/en/modules/tools/batchMod-del.tt | 13 ++++++++++--- .../prog/en/modules/tools/batchMod-edit.tt | 17 +++++++++++++---- 2 files changed, 23 insertions(+), 7 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 92d313784c..cb6038d674 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 @@ -156,6 +156,13 @@ for( x=0; x

[% deleted_items %] item(s) deleted.

[% IF delete_records %]

[% deleted_records %] record(s) deleted.

[% END %] + [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] + Return to the record + [% ELSIF src %] + Return to where you were + [% ELSE %] + Return to batch item deletion + [% END %] [% IF ( not_deleted_items ) %]
@@ -185,11 +192,11 @@ for( x=0; x [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] - Done + Return to the record [% ELSIF src %] - Done + Return to where you were [% ELSE %] - Return to batch item deletion + Return to batch item deletion [% END %]

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt index 38a76cecbf..362bf9a1bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -59,7 +59,16 @@ $(document).ready(function(){ [% ELSE %]

Batch item modification results

- [% modified_items %] item(s) modified (with [% modified_fields %] fields modified) + [% modified_items %] item(s) modified (with [% modified_fields %] fields modified). +
+ [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] + Return to the record + [% ELSIF src %] + Return to where you were + [% ELSE %] + Return to batch item modification + [% END %] +
[% END %] [% IF ( barcode_not_unique ) %]
Error saving item: Barcode must be unique.
[% END %] @@ -236,11 +245,11 @@ $(document).ready(function(){ [% ELSE %]
[% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] - Done + Return to the record [% ELSIF src %] - Done + Return to where you were [% ELSE %] - Done + Return to batch item modification [% END %]
-- 2.39.5