Browse Source

Bug 23192: Correct tab input on waiting_holds.inc

To test:
 1 - Place 2 holds
 2 - Confirm the holds
 3 - In the db change the expiration date:
UPDATE reserves SET expirationdate = '2019-01-01';
 4 - Go to Home->Circulation->Holds awaiting pickup
 5 - View your holds on the 'Holds waiting over' tab
 6 - Inspect the cancel button for one of the holds, note tab = "holdswaiting"
 7 - Apply patch
 8 - Refresh the page
 9 - Inspect the buttton, note tab = "holdsover"
10 - Cancel the hold
11 - Note you return to the holds over tab

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
remotes/origin/19.11.x
Nick Clemens 5 years ago
committed by Martin Renvoize
parent
commit
f45516e73a
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
  2. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt

2
koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc

@ -49,7 +49,7 @@
<input type="hidden" name="itemnumber" value="[% reserveloo.item.itemnumber | html %]" />
<input type="hidden" name="fbr" value="[% reserveloo.item.holdingbranch | html %]" />
<input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" />
<input type="hidden" name="tab" value="holdswaiting">
<input type="hidden" name="tab" value="[% tab %]">
[% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]
<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button>
[% ELSE %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt

@ -73,7 +73,7 @@
</ul>
<div id="holdswaiting">
[% IF ( reserveloop ) %]
[% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop %]
[% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %]
[% ELSE %]
<div class="dialog message">No holds found.</div>
[% END %]
@ -96,7 +96,7 @@
Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)
[% END %]
</span>
[% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop %]
[% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %]
[% ELSE %]
<div class="dialog message">No holds found.</div>
[% END %]

Loading…
Cancel
Save