From 40e667cd210b57061ca771caa38a4f6a14c22268 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Mon, 1 Aug 2016 07:17:04 -0700
Subject: [PATCH] Bug 17010 - Canceling a hold awaiting pickup no longer alerts
 librarian about next hold
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In previous versions of Koha, if a hold canceled from the "Holds over" tab had other holds on it,
the librarian would be alerted with the message "This item is on hold for pick-up at your library"
and directed to check it in to fill the next hold. This no longer happens.

Test Plan:
1) Apply this patch
2) Find a hold that has been waiting too long
3) Cancel that hold via waitingreserves.pl
4) Note you get the message "This item is on hold for pick-up at your library"
5) Confirm the ok button redirects you to the correct tab

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b80a18ee2f059309a78087e48b9464d2352d444f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 circ/waitingreserves.pl                                   | 3 ++-
 .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 0050ce3ac5..603dbc553d 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -162,9 +162,10 @@ $template->param(
     overcount   => $overcount,
     show_date   => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
     ReservesMaxPickUpDelay => $max_pickup_delay,
+    tab => $tab,
 );
 
-if ($item && $tab eq 'holdsover') {
+if ($item && $tab eq 'holdsover' && !@cancel_result) {
     print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
 } elsif ($cancelall) {
     print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 3183442245..5bcf6cf04f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -51,8 +51,8 @@
                     <p><strong>[% nextreservtitle %]</strong> is on hold for <strong> [% nextreservsurname %], [% nextreservfirstname %]</strong>.
                     Please retain this item and check it in to process the hold.
                     </p>
-                    <form name="cancelReservewithtransfert" action="waitingreserves.pl" method="post">
-                        <input type="submit" class="submit" value="OK" />
+                    <form name="cancelReservewithtransfert" action="waitingreserves.p#[% tab %]" method="post">
+                        <input class="btn" type="submit" class="submit" value="OK" />
                     </form>
                 </div>
             [% END %]
@@ -62,8 +62,8 @@
                     <p><strong>[% nextreservtitle %]</strong> is on hold for <strong>[% nextreservsurname %], [% nextreservfirstname %]</strong>.
                     Please retain this item and check it in to process the hold.
                     </p>
-                    <form name="cancelReservewithwaiting" action="waitingreserves.pl" method="post">
-                        <input type="submit" class="submit" value="OK"/>
+                    <form name="cancelReservewithwaiting" action="waitingreserves.pl#[% tab %]" method="post">
+                        <input class="btn" type="submit" class="submit" value="OK"/>
                     </form>
                 </div>
             [% END %]
-- 
2.39.5