From a4a3b44e84894bfb2903be80e78fa3dd1a105263 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Mon, 24 Jun 2019 11:54:56 +0000
Subject: [PATCH] Bug 23192: Correct tab input on waiting_holds.inc

To test:
 1 - Place 2 holds
 2 - Confirm the holds
 3 - In the db change the expiration date:
UPDATE reserves SET expirationdate = '2019-01-01';
 4 - Go to Home->Circulation->Holds awaiting pickup
 5 - View your holds on the 'Holds waiting over' tab
 6 - Inspect the cancel button for one of the holds, note tab = "holdswaiting"
 7 - Apply patch
 8 - Refresh the page
 9 - Inspect the buttton, note tab = "holdsover"
10 - Cancel the hold
11 - Note you return to the holds over tab

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit f45516e73ab6ac8c2240f206bd11a88e4935359c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit d673e0387e040170830b57cba0db9ce3aa8c67b0)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/includes/waiting_holds.inc  |  2 +-
 .../prog/en/modules/circ/waitingreserves.tt           | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
index edfea09515..9239dea77b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
@@ -46,7 +46,7 @@
                         <input type="hidden" name="itemnumber" value="[% reserveloo.item.itemnumber | html %]" />
                         <input type="hidden" name="fbr" value="[% reserveloo.item.holdingbranch | html %]" />
                         <input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" />
-                        <input type="hidden" name="tab" value="holdswaiting">
+                        <input type="hidden" name="tab" value="[% tab %]">
                         [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]
                             <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button>
                         [% ELSE %]
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 94a58ed650..fc73eca6cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -69,7 +69,7 @@
             </ul>
             <div id="holdswaiting">
         [% IF ( reserveloop ) %]
-            [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop %]
+            [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %]
         [% ELSE %]
             <div class="dialog message">No holds found.</div>
         [% END %]
@@ -90,11 +90,10 @@
                [% UNLESS TransferWhenCancelAllWaitingHolds %]
                     Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref)
                [% END %]
-
-               [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop %]
-        [% ELSE %]
-            <div class="dialog message">No holds found.</div>
-                [% END %]
+               [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %]
+            [% ELSE %]
+                <div class="dialog message">No holds found.</div>
+            [% END %]
         </div>
         </div>
     [% END %]
-- 
2.39.5