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 Signed-off-by: Tom Misilo <misilot@fit.edu> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> (cherry picked from commit353e30d73e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> (cherry picked from commitfddc423c09) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
This commit is contained in:
parent
4b10d5b610
commit
95cea538de
|
|
@ -47,6 +47,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;
|
||||
|
||||
|
|
@ -162,7 +163,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;
|
||||
|
|
|
|||
|
|
@ -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 %]
|
||||
|
|
|
|||
Loading…
Reference in New Issue