From 15953702bce6dcba94d351655fb42c29edd5789d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Tue, 7 Jan 2014 15:14:01 +0100
Subject: [PATCH] Bug 11475: fix return link after 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 <nengard@bywatersolutions.com>
All tests pass

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../intranet-tmpl/prog/en/modules/tools/batchMod-del.tt  | 9 +++++++--
 .../intranet-tmpl/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 615582a306..f93509ad71 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<allColumns.length; x++ ){
 
 
 <form name="f" action="batchMod.pl" method="post">
-     <input type="hidden" name="src" id="src" value="[% src %]" />
      <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber %]" />
      <input type="hidden" name="op" value="[% op %]" />
      <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
+     <input type="hidden" name="src" id="src" value="[% src %]" />
+     [% IF biblionumber %]
+        <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber %]" />
+     [% END %]
 
 [% IF ( item_loop ) %]
 	[% IF ( show ) %]<div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div>[% END %]
@@ -180,7 +183,9 @@ for( x=0; x<allColumns.length; x++ ){
 	[% END %]
 
     <p>
-        [% IF src %]
+        [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
+           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">Done</a>
+        [% ELSIF src %]
            <a href="[% src %]">Done</a>
         [% ELSE %]
            <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a>
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 d8f6f8a988..3c3dfda191 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(){
      <input type="hidden" name="runinbackground" id="runinbackground" value="" />
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
      <input type="hidden" name="src" id="src" value="[% src %]" />
+     [% IF biblionumber %]
+        <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber %]" />
+     [% END %]
 
 [% IF ( item_loop ) %]
   [% IF show %]
@@ -204,7 +207,9 @@ $(document).ready(function(){
 [% END %]
 [% ELSE %] <!-- // show -->
 <fieldset class="action">
-[% IF src %]
+[% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
+   <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">Done</a>
+[% ELSIF src %]
    <a href="[% src %]">Done</a>
 [% ELSE %]
    <a href="/cgi-bin/koha/tools/batchMod.pl">Done</a>
-- 
2.39.5