Bugzilla – Attachment 181631 Details for
Bug 17338
'Holds awaiting pickup' should keep you on the same tab when cancelling a hold
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17338: Fix redirection to correct tabs on waitingreserves.pl
Bug-17338-Fix-redirection-to-correct-tabs-on-waiti.patch (text/plain), 3.85 KB, created by
Lucas Gass (lukeg)
on 2025-04-28 16:53:58 UTC
(
hide
)
Description:
Bug 17338: Fix redirection to correct tabs on waitingreserves.pl
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2025-04-28 16:53:58 UTC
Size:
3.85 KB
patch
obsolete
>From 77ad6b50453d54ec93efe9f272e8fb4dd557c5ce 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. >--- > 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 b1527c960aa..28981bffcaf 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -145,7 +145,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 44a65e7c971..1de9bd9eaca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -56,7 +56,8 @@ > <div class="alert alert-info"> > <h2>This item is on hold for pick-up at [% Branches.GetName( branchcode ) | html %]</h2> > <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> >@@ -65,7 +66,8 @@ > <div class="alert alert-info"> > <h2>This item is on hold for pick-up at your library</h2> > <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> >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17338
:
179670
|
180203
|
181631
|
181830