View | Details | Raw Unified | Return to bug 13838
Collapse All | Expand All

(-)a/circ/waitingreserves.pl (-1 / +4 lines)
Lines 46-51 my $fbr = $input->param('fbr') || ''; Link Here
46
my $tbr            = $input->param('tbr') || '';
46
my $tbr            = $input->param('tbr') || '';
47
my $all_branches   = $input->param('allbranches') || '';
47
my $all_branches   = $input->param('allbranches') || '';
48
my $cancelall      = $input->param('cancelall');
48
my $cancelall      = $input->param('cancelall');
49
my $tab            = $input->param('tab');
49
50
50
my $cancel;
51
my $cancel;
51
52
Lines 161-167 $template->param( Link Here
161
    ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
162
    ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
162
);
163
);
163
164
164
if ($cancelall) {
165
if ($item && $tab eq 'holdsover') {
166
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
167
} elsif ($cancelall) {
165
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl");
168
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl");
166
} else {
169
} else {
167
    output_html_with_http_headers $input, $cookie, $template->output;
170
    output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-1 / +3 lines)
Lines 109-114 Link Here
109
                            <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" />
109
                            <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" />
110
                            <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" />
110
                            <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" />
111
                            <input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" />
111
                            <input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" />
112
                            <input type="hidden" name="tab" value="holdswaiting">
112
                            [% IF ( reserveloo.dotransfer ) %]
113
                            [% IF ( reserveloo.dotransfer ) %]
113
                            <input type="submit" value="Cancel hold and return to : [% reserveloo.branchname %]" /> 
114
                            <input type="submit" value="Cancel hold and return to : [% reserveloo.branchname %]" /> 
114
                            [% ELSE %]
115
                            [% ELSE %]
Lines 130-135 Link Here
130
               <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
131
               <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
131
                   <input type="hidden" name="cancelall" value="1" />
132
                   <input type="hidden" name="cancelall" value="1" />
132
                   <input type="hidden" name="allbranches" value="[% allbranches %]" />
133
                   <input type="hidden" name="allbranches" value="[% allbranches %]" />
134
                   <input type="hidden" name="tab" value="holdsover">
133
                   <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" />
135
                   <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" />
134
               </form>
136
               </form>
135
               [% UNLESS TransferWhenCancelAllWaitingHolds %]
137
               [% UNLESS TransferWhenCancelAllWaitingHolds %]
Lines 167-172 Link Here
167
                            <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
169
                            <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
168
                            <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" />
170
                            <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" />
169
                            <input type="hidden" name="tbr" value="[% overloo.homebranch %]" />
171
                            <input type="hidden" name="tbr" value="[% overloo.homebranch %]" />
172
                            <input type="hidden" name="tab" value="holdsover">
170
                            [% IF ( overloo.dotransfer ) %]
173
                            [% IF ( overloo.dotransfer ) %]
171
                            <input type="submit" value="Cancel hold and return to : [% overloo.branchname %]" />
174
                            <input type="submit" value="Cancel hold and return to : [% overloo.branchname %]" />
172
                            [% ELSE %]
175
                            [% ELSE %]
173
- 

Return to bug 13838