Bug 30577: Move item specific pickup locations to the left
When placing holds, staff will set the pickup location at the top, choose an item, then place the hold. It is easy not to notice the item specific locations dropdown. This patch moves it in line with the other selction areas on the request screen. To test: 1 - Find a record on staff client, place hold 2 - Select a patron to load the request screen 3 - Note the location dropdown for next available hold 4 - Note the item specific locations on the far right 5 - Apply patch 6 - Reload the page 7 - Note the item specific location dropdowns are now moved to the left 8 - Place the hold, verify it works with the dropdowns 9 - Verify title levelholds still work as expected 10 - Verify multi-holds still work Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Rebecca Coert <rcoert@arlingtonva.us> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens
Fridolin Somers
parent
0f7949de1c
commit
e61c835695
|
|
@ -597,6 +597,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>Hold</th>
|
||||
<th>Allowed pickup locations</th>
|
||||
[% IF Koha.Preference('item-level_itypes') %]
|
||||
<th>Item type</th>
|
||||
[% END %]
|
||||
|
|
@ -612,7 +613,6 @@
|
|||
<th>Vol no.</th>
|
||||
[% END %]
|
||||
<th>Information</th>
|
||||
<th>Allowed pickup locations</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -670,6 +670,18 @@
|
|||
</span>
|
||||
[% END # /IF force_hold_level %]
|
||||
</td>
|
||||
<td>
|
||||
[% IF (itemloo.pickup_locations_count > 0) %]
|
||||
<select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" style="width:100%;"
|
||||
data-item-id="[% itemloo.itemnumber | html %]"
|
||||
data-patron-id="[% patron.borrowernumber | html %]"
|
||||
data-pickup-location-source="item">
|
||||
[% IF (itemloo.default_pickup_location) %]
|
||||
<option value="[% itemloo.default_pickup_location.branchcode | html %]" selected="selected">[% itemloo.default_pickup_location.branchname | html %]</option>
|
||||
[% END %]
|
||||
</select>
|
||||
[% END %]
|
||||
</td>
|
||||
[% IF Koha.Preference('item-level_itypes') %]
|
||||
<td>
|
||||
[% UNLESS ( noItemTypeImages ) %]
|
||||
|
|
@ -759,18 +771,6 @@
|
|||
<span class="nfl">Not for loan ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => itemloo.notforloan ) | html %])</span>
|
||||
[% END %]
|
||||
</td>
|
||||
<td>
|
||||
[% IF (itemloo.pickup_locations_count > 0) %]
|
||||
<select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" style="width:100%;"
|
||||
data-item-id="[% itemloo.itemnumber | html %]"
|
||||
data-patron-id="[% patron.borrowernumber | html %]"
|
||||
data-pickup-location-source="item">
|
||||
[% IF (itemloo.default_pickup_location) %]
|
||||
<option value="[% itemloo.default_pickup_location.branchcode | html %]" selected="selected">[% itemloo.default_pickup_location.branchname | html %]</option>
|
||||
[% END %]
|
||||
</select>
|
||||
[% END %]
|
||||
</td>
|
||||
</tr>
|
||||
[% END # / UNLESS itemloo.hide %]
|
||||
[% END # /FOREACH itemloo %]
|
||||
|
|
@ -790,13 +790,13 @@
|
|||
<table id="requesttitles">
|
||||
<tr>
|
||||
<th> </th>
|
||||
<th>Pickup location</th>
|
||||
<th>Title</th>
|
||||
[% UNLESS Koha.Preference('item-level_itypes') %]
|
||||
<th>Item type</th>
|
||||
[% END %]
|
||||
<th>Priority</th>
|
||||
<th>Information</th>
|
||||
<th>Pickup location</th>
|
||||
</tr>
|
||||
[% FOREACH biblioloo IN biblioloop %]
|
||||
[% IF ( biblioloo.warn ) %]
|
||||
|
|
@ -809,6 +809,20 @@
|
|||
<input class="multi_hold_item_checkbox" type="checkbox" checked="checked" title="[% biblioloo.biblionumber | html %]"/>
|
||||
</td>
|
||||
[% END %]
|
||||
<td>
|
||||
[% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %]
|
||||
<select name="pickup_[% biblioloo.biblionumber | html %]"
|
||||
class="multi_pickup_select"
|
||||
data-biblio-id="[% biblioloo.biblionumber | html %]"
|
||||
data-patron-id="[% patron.borrowernumber | html %]"
|
||||
data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'>
|
||||
<option value=""></option>
|
||||
[% FOREACH pickup_location IN biblioloo.pickup_locations %]
|
||||
<option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
|
||||
[% END %]
|
||||
</select>
|
||||
[% END %]
|
||||
</td>
|
||||
<td>
|
||||
<ul>
|
||||
<li>
|
||||
|
|
@ -861,20 +875,6 @@
|
|||
[% END %]
|
||||
[% END %]
|
||||
</td>
|
||||
<td>
|
||||
[% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %]
|
||||
<select name="pickup_[% biblioloo.biblionumber | html %]"
|
||||
class="multi_pickup_select"
|
||||
data-biblio-id="[% biblioloo.biblionumber | html %]"
|
||||
data-patron-id="[% patron.borrowernumber | html %]"
|
||||
data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'>
|
||||
<option value=""></option>
|
||||
[% FOREACH pickup_location IN biblioloo.pickup_locations %]
|
||||
<option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
|
||||
[% END %]
|
||||
</select>
|
||||
[% END %]
|
||||
</td>
|
||||
</tr>
|
||||
[% END # /FOREACH biblioloo %]
|
||||
</table> <!-- /#requesttitles -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue