Bugzilla – Attachment 45531 Details for
Bug 13838
Redirect to 'expired holds' tab after cancelling a hold
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13838 - Redirect to 'expired holds' tab after cancelling a hold
Bug-13838---Redirect-to-expired-holds-tab-after-ca.patch (text/plain), 3.72 KB, created by
Kyle M Hall (khall)
on 2015-12-09 15:01:55 UTC
(
hide
)
Description:
Bug 13838 - Redirect to 'expired holds' tab after cancelling a hold
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-12-09 15:01:55 UTC
Size:
3.72 KB
patch
obsolete
>From c163ac230113e45cb59b5192299d7b5ee113fd4f Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 20 Apr 2015 12:31:11 -0700 >Subject: [PATCH] Bug 13838 - Redirect to 'expired holds' tab after cancelling > a hold > >When canceling a hold from the holds over tab, you are redirected back to the holds waiting tab. Instead, we should the librarian should continue to see the list of holds past the waiting length. > >Test Plan: >1) Apply this patch >2) Cancel a hold from the "Holds over" tab on circ/waitingreserves.pl >3) Note you are redirected back to the holds over tab >--- > circ/waitingreserves.pl | 5 ++++- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 3 +++ > 2 files changed, 7 insertions(+), 1 deletion(-) > >diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl >index 3e1b5c2..57f23a9 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -46,6 +46,7 @@ my $fbr = $input->param('fbr') || ''; > my $tbr = $input->param('tbr') || ''; > my $all_branches = $input->param('allbranches') || ''; > my $cancelall = $input->param('cancelall'); >+my $tab = $input->param('tab'); > > my $cancel; > >@@ -161,7 +162,9 @@ $template->param( > ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay') > ); > >-if ($cancelall) { >+if ($item && $tab eq 'holdsover') { >+ print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover"); >+} elsif ($cancelall) { > print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl"); > } else { > output_html_with_http_headers $input, $cookie, $template->output; >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 1d5faf4..1028033 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -109,6 +109,7 @@ > <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" /> > <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" /> > <input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" /> >+ <input type="hidden" name="tab" value="holdswaiting"> > [% IF ( reserveloo.dotransfer ) %] > <input type="submit" value="Cancel hold and return to : [% reserveloo.branchname %]" /> > [% ELSE %] >@@ -130,6 +131,7 @@ > <form name="cancelAllReserve" action="waitingreserves.pl" method="post"> > <input type="hidden" name="cancelall" value="1" /> > <input type="hidden" name="allbranches" value="[% allbranches %]" /> >+ <input type="hidden" name="tab" value="holdsover"> > <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" /> > </form> > [% UNLESS TransferWhenCancelAllWaitingHolds %] >@@ -167,6 +169,7 @@ > <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" /> > <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" /> > <input type="hidden" name="tbr" value="[% overloo.homebranch %]" /> >+ <input type="hidden" name="tab" value="holdsover"> > [% IF ( overloo.dotransfer ) %] > <input type="submit" value="Cancel hold and return to : [% overloo.branchname %]" /> > [% ELSE %] >-- >1.7.10.4
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 13838
:
38208
|
45531
|
45556
|
45596