Kyle M Hall
c2f1106f2e
On request.pl, the table of holds shows a suspend_until date picker for each hold, *unless* that hold is waiting or in transit. The script reserve/modrequest.pl assumes that there will be a suspend_until input for each hold, but that is incorrect. Assume there are 20 holds on a record, and 10 of them are waiting or in transit. If you were to then set the suspend until date on the 10 open holds, and use the "Update hold(s)" button, those 10 suspensions would apply to the 10 found holds and not the holds they should apply to! Test Plan: 1) Place two holds on a record 2) Check in an item and trap it for the first hold 3) Now that one hold is waiting and the other is not, attempt to set a suspension date using the "Update hold(s)" button 4) Note your hold does not get suspended! 5) Apply this patch 6) Restart all the things! 7) Repeat steps 1-3 8) Your hold should now be suspended! Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
220 lines
14 KiB
HTML
220 lines
14 KiB
HTML
[% USE Koha %]
|
|
<table>
|
|
<tr>
|
|
[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
|
|
<th>Priority</th>
|
|
<th> </th>
|
|
[% ELSE %]
|
|
<th>Delete?</th>
|
|
[% END %]
|
|
<th>Patron</th>
|
|
<th>Notes</th>
|
|
<th>Date</th>
|
|
<th>Expiration</th>
|
|
<th>Pickup library</th>
|
|
<th>Details</th>
|
|
[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
|
|
<th><img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th>
|
|
[% END %]
|
|
<th> </th>
|
|
<th> </th>
|
|
</tr>
|
|
|
|
[% SET first_priority = 0 %]
|
|
[% SET last_priority = holds.last.priority %]
|
|
|
|
[% FOREACH hold IN holds %]
|
|
[% IF !hold.found && first_priority == 0 %][% first_priority = hold.priority %][% END %]
|
|
<tr>
|
|
<td>
|
|
<input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
|
|
<input type="hidden" name="borrowernumber" value="[% hold.borrowernumber | html %]" />
|
|
<input type="hidden" name="biblionumber" value="[% hold.biblionumber | html %]" />
|
|
[% IF Koha.Preference('HoldsSplitQueue') == "nothing" && !hold.found %]
|
|
<select name="rank-request">
|
|
[% ELSE %]
|
|
<input type="hidden" name="rank-request" value="[% hold.priority | html %]">
|
|
<select name="rank-request" disabled="disabled">
|
|
[% END %]
|
|
[% IF ( hold.found ) %]
|
|
[% IF ( hold.intransit ) %]
|
|
<option value="T" selected="selected">In transit</option>
|
|
[% ELSE %]
|
|
<option value="W" selected="selected">Waiting</option>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
|
|
[% IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' %]
|
|
[% FOREACH optionloo IN hold.optionloop %]
|
|
[% IF ( optionloo.selected ) %]
|
|
<option value="[% optionloo.num | html %]" selected="selected">[% optionloo.num | html %]</option>
|
|
[% ELSE %]
|
|
<option value="[% optionloo.num | html %]">[% optionloo.num | html %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% SET ranker = 1 %]
|
|
[% FOREACH h IN holds %]
|
|
[% NEXT IF h.found %]
|
|
[% IF ( h.priority == hold.priority ) %]
|
|
<option value="[% h.priority | html %]" selected="selected">[% ranker | html %]</option>
|
|
[% ELSE %]
|
|
<option value="[% h.priority | html %]">[% ranker | html %]</option>
|
|
[% END %]
|
|
[% ranker = ranker + 1 %]
|
|
[% END %]
|
|
[% END %]
|
|
[% ELSIF !hold.found %]
|
|
<option value="[% hold.priority | html %]" selected="selected">[% hold.priority | html %]</option>
|
|
[% END %]
|
|
|
|
<option value="del">del</option>
|
|
</select>
|
|
</td>
|
|
|
|
[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
|
|
[% UNLESS hold.found %]
|
|
[% SET prev_priority = loop.prev.priority %]
|
|
[% SET next_priority = loop.next.priority %]
|
|
[% holds.index | html %]
|
|
|
|
<td style="white-space:nowrap;">
|
|
<a title="Move hold up" href="request.pl?action=move&where=up&first_priority=[% first_priority | html %]&last_priority=[% last_priority | html %]&prev_priority=[% prev_priority | html %]&next_priority=[% next_priority | html %]&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&reserve_id=[% hold.reserve_id | html %]&date=[% hold.date | html %]">
|
|
<img src="[% interface | html %]/[% theme | html %]/img/go-up.png" alt="Go up" />
|
|
</a>
|
|
|
|
<a title="Move hold to top" href="request.pl?action=move&where=top&first_priority=[% first_priority | html %]&last_priority=[% last_priority | html %]&prev_priority=[% prev_priority | html %]&next_priority=[% next_priority | html %]&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&reserve_id=[% hold.reserve_id | html %]&date=[% hold.date | html %]">
|
|
<img src="[% interface | html %]/[% theme | html %]/img/go-top.png" alt="Go top" />
|
|
</a>
|
|
|
|
<a title="Move hold to bottom" href="request.pl?action=move&where=bottom&first_priority=[% first_priority | html %]&last_priority=[% last_priority | html %]&prev_priority=[% prev_priority | html %]&next_priority=[% next_priority | html %]&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&reserve_id=[% hold.reserve_id | html %]&date=[% hold.date | html %]">
|
|
<img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Go bottom" />
|
|
</a>
|
|
|
|
<a title="Move hold down" href="request.pl?action=move&where=down&first_priority=[% first_priority | html %]&last_priority=[% last_priority | html %]&prev_priority=[% prev_priority | html %]&next_priority=[% next_priority | html %]&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&reserve_id=[% hold.reserve_id | html %]&date=[% hold.date | html %]">
|
|
<img src="[% interface | html %]/[% theme | html %]/img/go-down.png" alt="Go down" />
|
|
</a>
|
|
</td>
|
|
[% ELSE %]
|
|
<td></td>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<td>
|
|
[% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]
|
|
</td>
|
|
|
|
<td>[% hold.notes | html %]</td>
|
|
<td>
|
|
[% IF Koha.Preference('AllowHoldDateInFuture') %]
|
|
<input type="text" class="datepicker" value="[% hold.date | $KohaDates %]" required="required" size="10" name="reservedate" />
|
|
[% ELSE %]
|
|
[% hold.date | $KohaDates %]
|
|
[% END %]
|
|
</td>
|
|
<td><input type="text" class="datepicker" value="[% hold.expirationdate | $KohaDates %]" size="10" name="expirationdate" /></td>
|
|
|
|
<td>
|
|
[% IF ( hold.found ) %]
|
|
[% IF ( hold.atdestination ) %]
|
|
[% IF ( hold.found ) %]
|
|
Item waiting at <b> [% hold.wbrname | html %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" /> since [% hold.waiting_date | $KohaDates %]
|
|
[% ELSE %]
|
|
Waiting to be pulled <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
|
|
[% END %]
|
|
[% ELSE %]
|
|
Item being transferred to <b> [% hold.wbrname | html %]</b> <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %]
|
|
[% Branches.GetName(hold.branchcode) | html %] <input type="hidden" name="pickup" value="[% hold.branchcode | html %]" />
|
|
[% ELSE %]
|
|
<select name="pickup">
|
|
[% PROCESS options_for_libraries libraries => Branches.pickup_locations( { search_params => { item => hold.itemnumber, biblio => hold.biblionumber, patron => hold.patron }, selected => hold.branchcode }) %]
|
|
</select>
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
|
|
<td>
|
|
[% IF ( hold.found ) %]
|
|
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
|
|
[% IF ( hold.barcodenumber ) %]
|
|
[% hold.barcodenumber | html %]
|
|
<input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
|
|
[% ELSE %]
|
|
No barcode
|
|
[% END %]
|
|
</a>
|
|
[% ELSE %]
|
|
[% IF ( hold.item_level_hold ) %]
|
|
<i>
|
|
Only item
|
|
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
|
|
[% IF ( hold.barcodenumber ) %]
|
|
[% hold.barcodenumber | html %]
|
|
<input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
|
|
[% ELSE %]
|
|
No barcode
|
|
[% END %]
|
|
</a>
|
|
</i>
|
|
[% ELSE %]
|
|
[% IF hold.itemtype %]
|
|
<i>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</i>
|
|
[% ELSE %]
|
|
<i>Next available</i>
|
|
[% END %]
|
|
|
|
<input type="hidden" name="itemnumber" value="" />
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
|
|
[% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
|
|
[% UNLESS hold.found %]
|
|
<td>
|
|
<a title="Toggle lowest priority" href="request.pl?action=setLowestPriority&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&reserve_id=[% hold.reserve_id | html %]&date=[% hold.date | html %]">
|
|
[% IF ( hold.lowestPriority ) %]
|
|
<img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Unset lowest priority" />
|
|
[% ELSE %]
|
|
<img src="[% interface | html %]/[% theme | html %]/img/go-down.png" alt="Set to lowest priority" />
|
|
[% END %]
|
|
</a>
|
|
</td>
|
|
[% ELSE %]
|
|
<td></td>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<td>
|
|
<a class="cancel-hold" title="Cancel hold" href="request.pl?action=cancel&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&reserve_id=[% hold.reserve_id | html %]&date=[% hold.date | html %]">
|
|
<img src="[% interface | html %]/[% theme | html %]/img/x.png" alt="Cancel" />
|
|
</a>
|
|
</td>
|
|
|
|
<td>
|
|
[% IF Koha.Preference('SuspendHoldsIntranet') %]
|
|
[% UNLESS ( hold.found ) %]
|
|
<input type="button" value="[% IF ( hold.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&reserve_id=[% hold.reserve_id | html %]&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&date=[% hold.date | html %]&suspend_until=' + $('#suspend_until_[% hold.reserve_id | html %]').val()" />
|
|
|
|
[% IF Koha.Preference('AutoResumeSuspendedHolds') %]
|
|
<label for="suspend_until_[% hold.reserve_id | html %]">[% IF ( hold.suspend ) %] on [% ELSE %] until [% END %]</label>
|
|
<input type="text" name="suspend_until_[% hold.reserve_id | html %]" id="suspend_until_[% hold.reserve_id | html %]" size="10" value="[% hold.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
|
|
<a href='#' onclick="document.getElementById('suspend_until_[% hold.reserve_id | html %]').value='';">Clear date</a>
|
|
[% ELSE %]
|
|
<input type="hidden" name="suspend_until_[% hold.reserve_id | html %]" id="suspend_until_[% hold.reserve_id | html %]" value=""/>
|
|
[% END %]
|
|
[% END %]
|
|
[% END # IF SuspendHoldsIntranet %]
|
|
|
|
[% IF ( hold.found ) %]
|
|
<input type="button" id="revert_hold_[% hold.reserve_id | html %]" value="[% IF hold.intransit %]Revert transit status[% ELSE %]Revert waiting status[% END %]" onclick="window.location.href='request.pl?action=move&where=down&first_priority=[% first_priority | uri %]&last_priority=[% last_priority | uri %]&prev_priority=0&next_priority=1&borrowernumber=[% hold.borrowernumber | uri %]&biblionumber=[% hold.biblionumber | uri %]&itemnumber=[% hold.itemnumber | uri %]&reserve_id=[% hold.reserve_id | uri %]&date=[% hold.date | uri %]'">
|
|
[% END %]
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
[% END %]
|
|
</table>
|