From 5b6ce4a69900537f0761d4f9ad81629965f8c33c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 7 Jan 2014 15:14:01 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 11475: Links are broken when editing/deleting items in batch Bug introduced by bug 9044. Test plan: 1- First we search for records with multiple items (books or serials, does not matter) 2- We open this record we found with multiple items for editing 3- We chose "Edit items in batch" option from the "Edit" menu 4- We make corrections on the fields under the "Edit item" (For example we change the collection code as "fiction") 5- We save this using "Save button" at the bottom, after we are done. 6- Just after we save, there will be a button named "Done" available just under the page, and when we click on "Done" we encounter the Error screen. Before the patch, the "Done" link points to /cgi-bin/koha/tools/CATALOGUING. After applying the patch, the "Done" link points to the biblio detail page. Signed-off-by: Nicole C. Engard All tests pass --- .../prog/en/modules/tools/batchMod-del.tt | 9 +++++++-- .../prog/en/modules/tools/batchMod-edit.tt | 7 ++++++- 2 files changed, 13 insertions(+), 3 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 615582a..f93509a 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 @@ -67,11 +67,14 @@ for( x=0; x - + + [% IF biblionumber %] + + [% END %] [% IF ( item_loop ) %] [% IF ( show ) %][% END %] @@ -180,7 +183,9 @@ for( x=0; x - [% IF src %] + [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] + Done + [% ELSIF src %] Done [% ELSE %] Return to batch item deletion 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 d8f6f8a..3c3dfda 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 @@ -94,6 +94,9 @@ $(document).ready(function(){ + [% IF biblionumber %] + + [% END %] [% IF ( item_loop ) %] [% IF show %] @@ -204,7 +207,9 @@ $(document).ready(function(){ [% END %] [% ELSE %]
-[% IF src %] +[% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] + Done +[% ELSIF src %] Done [% ELSE %] Done -- 1.7.2.3