From 66211fbbe821546516780d11e3bb58e86b768daf Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Mon, 28 Apr 2025 16:50:41 +0000
Subject: [PATCH] Bug 17338: Fix redirection to correct tabs on
 waitingreserves.pl

To test:
1. Place multiple holds, good to have at least 4, for pickup at a location, I used Nick's handy script
2. Perl misc/cronjobs/holds/build_holds_queue.pl
3. Check in at least 4 items for pickup at one location so they'll be wating
4. Update the expiration date on those holds using ktd --dbshell
  update reserves set expirationdate = DATE('2024-01-01') where branchcode='CPL';
5. On Circulation > Holds waiting past their expiration date tab use the cancel button that is in the actions column to cancel a hold

The page loads on the Holds waiting tab, although in the url you see /circ/waitingreserves.pl?tab=holdsover

6. APPLY PATCH
7. Try 1 - 5 again, this time after step 5 you should be redirected.
8. Try cancelling holds with a transfer, ensuring you get redirected correctly.

Signed-off-by: Andrew Auld <andrew.auld@openfifth.co.uk>
Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 9c746e675c072ca29365e907fa351cc985fad70d)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
---
 circ/waitingreserves.pl                                     | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 9322a0f779..e9d891c461 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -135,7 +135,7 @@ $template->param(
 $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
 
 if ($item && $tab eq 'holdsover' && !@cancel_result) {
-    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
+    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl?tab=holdsover");
 } elsif ( $op eq 'cud-cancelall' ) {
     print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl");
 } 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 2405b4da0f..831e9af4cb 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,8 @@
                                         <p><strong>[% nextreservtitle | html %]</strong> is on hold for <strong> [% nextreservsurname | html %], [% nextreservfirstname | html %]</strong>.
                                         Please retain this item and check it in to process the hold.
                                         </p>
-                                        <form name="cancelReservewithtransfert" action="waitingreserves.pl#[% tab | html %]" method="get">
+                                        <form name="cancelReservewithtransfert" action="waitingreserves.pl" method="get">
+                                            <input type="hidden" name="tab" value="[% tab | html %]" />
                                             <button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> OK</button>
                                         </form>
                                     </div>
@@ -80,7 +81,8 @@
                                         <p><strong>[% nextreservtitle | html %]</strong> is on hold for <strong>[% nextreservsurname | html %], [% nextreservfirstname | html %]</strong>.
                                         Please retain this item and check it in to process the hold.
                                         </p>
-                                        <form name="cancelReservewithwaiting" action="waitingreserves.pl#[% tab | html %]" method="get">
+                                        <form name="cancelReservewithwaiting" action="waitingreserves.pl" method="get">
+                                            <input type="hidden" name="tab" value="[% tab | html %]" />
                                             <button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> OK</button>
                                         </form>
                                     </div>