Attachment 150187 Details for Bug 33575 – Bug 33575: Add dataTable to hold table on /reserve/request.tt

[patch] Bug 33575: Add dataTable to hold table on /reserve/request.tt

Bug-33575-Add-dataTable-to-hold-table-on-reservere.patch (text/plain), 35.88 KB, created by PTFS Europe Sandboxes on 2023-04-25 11:27:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: PTFS Europe Sandboxes

Created: 2023-04-25 11:27:29 UTC

Size: 35.88 KB

patch

obsolete

>From 642f181aa9227453cd5a9e81d300adef43e352db Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Thu, 20 Apr 2023 15:47:01 +0000
>Subject: [PATCH] Bug 33575: Add dataTable to hold table on /reserve/request.tt
>
>To test:
>1. Have a record with several holds on it.
>2. Go to the holds page for that record ( /cgi-bin/koha/reserve/request.pl?biblionumber=144 )
>3. Cannot sort by columns
>4. Apply patch, restart_all
>5. Now the table should be a dataTable that will allow you sort.
>6. Try hiding columns by clicking on the 'Columns' icon above the table, make sure columns are correctly being hidden.
>7. Try to hide columns by going to Adminstration > Table settings ( Circulation > Holds > patron_holds_table ), make sure columns are correctly being hidden.
>8. Now login with a user who has the 'place_holds' permission but does NOT have the 'modify_holds_priority' permssion.
>9. The table will not have the change priority columns. Make sure all columns can still be hidden/shown correctly for that use.
>
>Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
>---
> admin/columns_settings.yml                    |  32 ++
> .../prog/en/includes/holds_table.inc          | 407 +++++++++---------
> .../prog/en/modules/reserve/request.tt        |   7 +
> 3 files changed, 242 insertions(+), 204 deletions(-)
>
>diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
>index 12091f3154..89432b10a6 100644
>--- a/admin/columns_settings.yml
>+++ b/admin/columns_settings.yml
>@@ -1552,6 +1552,38 @@ modules:
>             -
>               columnname: action
> 
>+    holds:
>+      patron_holds_table:
>+        columns:
>+            -
>+              columnname: checkbox
>+              cannot_be_toggled: 1
>+              cannot_be_modified: 1
>+            -
>+              columnname: priority
>+            -
>+              columnname: change_priority
>+            -
>+              columnname: patron
>+            -
>+              columnname: notes
>+            -
>+              columnname: date
>+            -
>+              columnname: expiration
>+            -
>+              columnname: pickup_library
>+            -
>+              columnname: details
>+            -
>+              columnname: set_lowest_priority
>+            -
>+              columnname: delete
>+            -
>+              columnname: suspend
>+            -
>+              columnname: print_slip
>+
>     holdsratios:
>       holds-ratios:
>         default_display_length: 20
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
>index cf0e6b626c..f46a3ef26a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
>@@ -1,28 +1,26 @@
> [% USE Koha %]
> [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
> [% USE AuthorisedValues %]
>-<table class="holds_table">
>+<table id="patron_holds_table" class="holds_table">
>     <thead>
>         <tr>
>-            <th><input type="checkbox" class="select_hold_all"/></th>
>-            <th>Priority</th>
>+            <th id="checkbox" data-colname="checkbox"><input type="checkbox" class="select_hold_all"/></th>
>+            <th id="priority" data-colname="priority">Priority</th>
>             [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>-                <th>&nbsp;</th>
>+                <th id="change_priority" data-colname="change_priority">Change priority</th>
>             [% END %]
>-            <th>Patron</th>
>-            <th>Notes</th>
>-            <th>Date</th>
>-            <th>Expiration</th>
>-            <th>Pickup library</th>
>-            <th>Details</th>
>+            <th id="patron" data-colname="patron">Patron</th>
>+            <th id="notes" data-colname="notes">Notes</th>
>+            <th id="date" data-colname="date">Date</th>
>+            <th id="expiration" data-colname="expiration">Expiration</th>
>+            <th id="pickup_library" data-colname="pickup_library">Pickup library</th>
>+            <th id="details" data-colname="details">Details</th>
>             [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>-                <th>
>-                    <i class="fa fa-lg fa-rotate-90 fa-fast-forward" title="Toggle set to lowest priority"></i>
>-                </th>
>+                <th id="set_lowest_priority" data-colname="set_lowest_priority"><i class="fa fa-lg fa-rotate-90 fa-fast-forward" title="Toggle set to lowest priority"></i></th>
>             [% END %]
>-            <th>&nbsp;</th>
>-            <th>&nbsp;</th>
>-            <th>Print hold/transfer slip</th>
>+            <th id="delete" data-colname="delete">Delete</th>
>+            <th id="suspend" data-colname="suspend">Suspend</th>
>+            <th id="print_slip" data-colname="print_slip">Print hold/transfer slip</th>
>         </tr>
>     </thead>
>     [%- SET first_priority = 0 -%]
>@@ -40,213 +38,214 @@
>             [%- loop_priority = loop_priority + 1- %]
>         [%- END -%]
>     [% END %]
>-
>-    [% FOREACH hold IN holds %]
>-    [%- IF !hold.found && first_priority == 0 -%]
>-        [%- first_priority = hold.priority -%]
>-        [%- found_holds = loop.index() -%]
>-    [%- END -%]
>-    [%- IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' -%]
>-        [%- this_priority = hold.priority -%]
>-    [%- ELSE -%]
>-        [%- this_priority = loop.count() - found_holds -%]
>-    [%- END -%]
>-        [% IF hold.suspend %]
>-            <tr class="suspend">
>-        [% ELSE %]
>-            <tr>
>-        [% END %]
>-            <td><input type="checkbox" class="select_hold" data-id="[% hold.reserve_id | html %]"/></td>
>-            <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 ( CAN_user_reserveforothers_modify_holds_priority ) %]
>-                    [% IF Koha.Preference('HoldsSplitQueue') == "nothing" && !hold.found %]
>-                        <select name="rank-request" class="rank-request" data-hold-id="[% hold.reserve_id | html %]">
>-                        [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>-                            [% PROCESS priority_dropdown %]
>-                        [% ELSE %]
>-                            <option value="[% hold.priority | html %]" selected="selected">[% this_priority | html %]</option>
>-                        [% END %]
>-                            <option value="del">del</option>
>-                        </select>
>-                    [% ELSE %]
>-                        <input type="hidden" name="rank-request" class="rank-request" value="[% hold.priority | html %]" data-hold-id="[% hold.reserve_id | html %]">
>-                        <select name="rank-request" class="rank-request" disabled="disabled" data-hold-id="[% hold.reserve_id | html %]">
>-                        [% IF ( hold.found ) %]
>-                            [% IF ( hold.intransit ) %]
>-                                <option value="T" selected="selected">In transit</option>
>-                            [% ELSIF (hold.inprocessing) %]
>-                                <option value="P" selected="selected">In processing</option>
>+    <tbody>
>+        [% FOREACH hold IN holds %]
>+        [%- IF !hold.found && first_priority == 0 -%]
>+            [%- first_priority = hold.priority -%]
>+            [%- found_holds = loop.index() -%]
>+        [%- END -%]
>+        [%- IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' -%]
>+            [%- this_priority = hold.priority -%]
>+        [%- ELSE -%]
>+            [%- this_priority = loop.count() - found_holds -%]
>+        [%- END -%]
>+            [% IF hold.suspend %]
>+                <tr class="suspend">
>+            [% ELSE %]
>+                <tr>
>+            [% END %]
>+                <td><input type="checkbox" class="select_hold" data-id="[% hold.reserve_id | html %]"/></td>
>+                <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 ( CAN_user_reserveforothers_modify_holds_priority ) %]
>+                        [% IF Koha.Preference('HoldsSplitQueue') == "nothing" && !hold.found %]
>+                            <select name="rank-request" class="rank-request" data-hold-id="[% hold.reserve_id | html %]">
>+                            [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>+                                [% PROCESS priority_dropdown %]
>                             [% ELSE %]
>-                                <option value="W" selected="selected">Waiting</option>
>+                                <option value="[% hold.priority | html %]" selected="selected">[% this_priority | html %]</option>
>                             [% END %]
>+                                <option value="del">del</option>
>+                            </select>
>                         [% ELSE %]
>-                            <option value="[% hold.priority | html %]" selected="selected">[% this_priority | html %]</option>
>+                            <input type="hidden" name="rank-request" class="rank-request" value="[% hold.priority | html %]" data-hold-id="[% hold.reserve_id | html %]">
>+                            <select name="rank-request" class="rank-request" disabled="disabled" data-hold-id="[% hold.reserve_id | html %]">
>+                            [% IF ( hold.found ) %]
>+                                [% IF ( hold.intransit ) %]
>+                                    <option value="T" selected="selected">In transit</option>
>+                                [% ELSIF (hold.inprocessing) %]
>+                                    <option value="P" selected="selected">In processing</option>
>+                                [% ELSE %]
>+                                    <option value="W" selected="selected">Waiting</option>
>+                                [% END %]
>+                            [% ELSE %]
>+                                <option value="[% hold.priority | html %]" selected="selected">[% this_priority | html %]</option>
>+                            [% END %]
>+                            </select>
>                         [% END %]
>-                        </select>
>+                    [% ELSE %]
>+                        <input type="hidden" name="rank-request" class="rank-request" value="[% hold.priority | html %]" data-hold-id="[% hold.reserve_id | html %]">
>+                        [% hold.priority | html %]
>                     [% END %]
>-                [% ELSE %]
>-                    <input type="hidden" name="rank-request" class="rank-request" value="[% hold.priority | html %]" data-hold-id="[% hold.reserve_id | html %]">
>-                    [% hold.priority | html %]
>-                [% END %]
>-            </td>
>-            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
>-            [%- UNLESS hold.found -%]
>-                    [%- SET prev_priority  = loop.prev.priority -%]
>-                    [%- SET next_priority  = loop.next.priority -%]
>-                    <td style="white-space:nowrap;">
>-                        <a class="hold-arrow" title="Move hold up" href="request.pl?action=move&amp;where=up&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>-                            <i class="fa fa-lg icon-move-hold-up" aria-hidden="true"></i>
>-                        </a>
>+                </td>
>+                [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
>+                [%- UNLESS hold.found -%]
>+                        [%- SET prev_priority  = loop.prev.priority -%]
>+                        [%- SET next_priority  = loop.next.priority -%]
>+                        <td style="white-space:nowrap;">
>+                            <a class="hold-arrow" title="Move hold up" href="request.pl?action=move&amp;where=up&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+                                <i class="fa fa-lg icon-move-hold-up" aria-hidden="true"></i>
>+                            </a>
> 
>-                        <a class="hold-arrow" title="Move hold to top" href="request.pl?action=move&amp;where=top&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>-                            <i class="fa fa-lg icon-move-hold-top" aria-hidden="true"></i>
>-                        </a>
>+                            <a class="hold-arrow" title="Move hold to top" href="request.pl?action=move&amp;where=top&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+                                <i class="fa fa-lg icon-move-hold-top" aria-hidden="true"></i>
>+                            </a>
> 
>-                        <a class="hold-arrow" title="Move hold to bottom" href="request.pl?action=move&amp;where=bottom&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>-                            <i class="fa fa-lg icon-move-hold-bottom" aria-hidden="true"></i>
>-                        </a>
>+                            <a class="hold-arrow" title="Move hold to bottom" href="request.pl?action=move&amp;where=bottom&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+                                <i class="fa fa-lg icon-move-hold-bottom" aria-hidden="true"></i>
>+                            </a>
> 
>-                        <a class="hold-arrow" title="Move hold down" href="request.pl?action=move&amp;where=down&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>-                            <i class="fa fa-lg icon-move-hold-down" aria-hidden="true"></i>
>-                        </a>
>-                    </td>
>-        [%- ELSE -%]
>-            <td></td>
>-        [%- END -%]
>+                            <a class="hold-arrow" title="Move hold down" href="request.pl?action=move&amp;where=down&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+                                <i class="fa fa-lg icon-move-hold-down" aria-hidden="true"></i>
>+                            </a>
>+                        </td>
>+            [%- ELSE -%]
>+                <td></td>
>             [%- END -%]
>-            <td>
>-                [% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]
>-            </td>
>-            <td>[% hold.notes | html | html_line_break %]</td>
>-            <td>
>-                [% IF Koha.Preference('AllowHoldDateInFuture') %]
>-                    <input type="text" class="flatpickr" value="[% hold.date | html %]" required="required" size="10" name="reservedate" />
>-                [% ELSE %]
>-                    [% hold.date | $KohaDates %]
>-                [% END %]
>-            </td>
>-            <td>
>-                <input type="text" class="flatpickr" data-flatpickr-futuredate="true" value="[% hold.expirationdate | html %]" size="10" name="expirationdate" />
>-            </td>
>-            <td>
>-                [%- IF ( hold.found ) -%]
>-                    <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
>-                    [%- IF ( hold.atdestination ) -%]
>-                            Item waiting at <strong> [% hold.wbrname | html %]</strong>[% IF hold.desk_name %], [% hold.desk_name | html %],[% END %] since [% hold.waiting_date | $KohaDates %]
>-                    [%- ELSIF (hold.intransit) -%]
>-                        Item being transferred to <strong> [% hold.wbrname | html %]</strong>
>-                    [%- ELSIF (hold.inprocessing) -%]
>-                        Item being processed at <strong> [% hold.wbrname | html %]</strong>
>-                    [%- ELSE -%]
>-                        Hold expected at <strong>[% hold.wbrname | html %]</strong>, please checkin to verify status
>-                    [%- 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 class="pickup_location_dropdown"
>-                                data-selected="[% hold.branchcode | html %]"
>-                                data-hold-id="[% hold.reserve_id | html %]"
>-                                data-pickup-location-source="hold"
>-                                name="pickup">
>-                            <option selected="selected" value="[% hold.branchcode | html %]">[% Branches.GetName(hold.branchcode) | html %]</option>
>-                            <option value="" disabled="disabled" class="loading">Loading...</option>
>-                        </select>
>-                        <img class="loading_[% hold.reserve_id | html %]" src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" style="display:none;"/>
>-                    [%- END -%]
>                 [%- END -%]
>-            </td>
>-            <td>
>-                [%- IF ( hold.found ) -%]
>-                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
>-                        [%- IF ( hold.barcodenumber ) -%]
>-                            [%- hold.barcodenumber | html -%]
>-                            <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
>+                <td>
>+                    [% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]
>+                </td>
>+                <td>[% hold.notes | html | html_line_break %]</td>
>+                <td>
>+                    [% IF Koha.Preference('AllowHoldDateInFuture') %]
>+                        <input type="text" class="flatpickr" value="[% hold.date | html %]" required="required" size="10" name="reservedate" />
>+                    [% ELSE %]
>+                        [% hold.date | $KohaDates %]
>+                    [% END %]
>+                </td>
>+                <td>
>+                    <input type="text" class="flatpickr" data-flatpickr-futuredate="true" value="[% hold.expirationdate | html %]" size="10" name="expirationdate" />
>+                </td>
>+                <td>
>+                    [%- IF ( hold.found ) -%]
>+                        <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
>+                        [%- IF ( hold.atdestination ) -%]
>+                                Item waiting at <strong> [% hold.wbrname | html %]</strong>[% IF hold.desk_name %], [% hold.desk_name | html %],[% END %] since [% hold.waiting_date | $KohaDates %]
>+                        [%- ELSIF (hold.intransit) -%]
>+                            Item being transferred to <strong> [% hold.wbrname | html %]</strong>
>+                        [%- ELSIF (hold.inprocessing) -%]
>+                            Item being processed at <strong> [% hold.wbrname | html %]</strong>
>                         [%- ELSE -%]
>-                            <span>No barcode</span>
>+                            Hold expected at <strong>[% hold.wbrname | html %]</strong>, please checkin to verify status
>                         [%- END -%]
>-                    </a>
>-                [%- ELSE -%]
>-                    [%- IF ( hold.item_level_hold ) -%]
>-                        <em>
>-                            <span>Only item</span>
>-                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
>-                                [%- IF ( hold.barcodenumber ) -%]
>-                                    [%- hold.barcodenumber | html -%]
>-                                    <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
>-                                [%- ELSE -%]
>-                                    <span>No barcode</span>
>-                                [%- END -%]
>-                            </a>
>-                        </em>
>                     [%- ELSE -%]
>-                        [%- IF hold.itemtype -%]
>-                            <em>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</em>
>-                        [%- ELSIF hold.object.item_group -%]
>-                            <em>Next available item from group <strong>[% hold.object.item_group.description | html %]</strong></em>
>+                        [%- IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 -%]
>+                            [% Branches.GetName(hold.branchcode) | html %] <input type="hidden" name="pickup" value="[% hold.branchcode | html %]" />
>                         [%- ELSE -%]
>-                            <em>Next available</em>
>+                            <select class="pickup_location_dropdown"
>+                                    data-selected="[% hold.branchcode | html %]"
>+                                    data-hold-id="[% hold.reserve_id | html %]"
>+                                    data-pickup-location-source="hold"
>+                                    name="pickup">
>+                                <option selected="selected" value="[% hold.branchcode | html %]">[% Branches.GetName(hold.branchcode) | html %]</option>
>+                                <option value="" disabled="disabled" class="loading">Loading...</option>
>+                            </select>
>+                            <img class="loading_[% hold.reserve_id | html %]" src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" style="display:none;"/>
>                         [%- END -%]
>-
>-                        <input type="hidden" name="itemnumber" value="" />
>                     [%- END -%]
>-                [%- END -%]
>-                [%- IF hold.non_priority -%]
>-                    <br><i>Non priority hold</i>
>-                [%- END -%]
>-            </td>
>-            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
>-            [%- UNLESS hold.found -%]
>-                    <td>
>-                            [% IF ( hold.lowestPriority ) %]
>-                                <a class="hold-arrow" title="Remove lowest priority" href="request.pl?action=setLowestPriority&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>-                                    <i class="fa fa-lg fa-rotate-90 icon-unset-lowest" aria-hidden="true"></i>
>-                            [% ELSE %]
>-                                <a class="hold-arrow" title="Set lowest priority" href="request.pl?action=setLowestPriority&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>-                                    <i class="fa fa-lg fa-rotate-90 icon-set-lowest" aria-hidden="true"></i>
>-                            [% END %]
>+                </td>
>+                <td>
>+                    [%- IF ( hold.found ) -%]
>+                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
>+                            [%- IF ( hold.barcodenumber ) -%]
>+                                [%- hold.barcodenumber | html -%]
>+                                <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
>+                            [%- ELSE -%]
>+                                <span>No barcode</span>
>+                            [%- END -%]
>                         </a>
>-                    </td>
>-        [%- ELSE -%]
>-            <td></td>
>-        [%- END -%]
>-            [%- END -%]
>-            <td>
>-                <a class="cancel-hold" title="Cancel hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>-                    <i class="fa fa-trash" aria-label="Cancel hold"></i>
>-                </a>
>-            </td>
>-            <td>
>-                [% IF Koha.Preference('SuspendHoldsIntranet') %]
>-                    [% UNLESS ( hold.found ) %]
>-                        <button class="btn btn-default btn-xs toggle-suspend" data-reserve-id="[% hold.reserve_id | html %]" data-biblionumber="[% hold.biblionumber | html %]">
>-                            [% IF ( hold.suspend ) %]
>-                                <i class="fa fa-play" aria-hidden="true"></i> Unsuspend
>-                            [% ELSE %]
>-                                <i class="fa fa-pause" aria-hidden="true"></i> Suspend
>-                            [% END %]
>-                        </button>
>-
>-                        [% 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 | html %]" class="flatpickr" data-flatpickr-futuredate="true" />
>+                    [%- ELSE -%]
>+                        [%- IF ( hold.item_level_hold ) -%]
>+                            <em>
>+                                <span>Only item</span>
>+                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
>+                                    [%- IF ( hold.barcodenumber ) -%]
>+                                        [%- hold.barcodenumber | html -%]
>+                                        <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
>+                                    [%- ELSE -%]
>+                                        <span>No barcode</span>
>+                                    [%- END -%]
>+                                </a>
>+                            </em>
>                         [%- ELSE -%]
>-                            <input type="hidden" name="suspend_until_[% hold.reserve_id | html %]" id="suspend_until_[% hold.reserve_id | html %]" value=""/>
>+                            [%- IF hold.itemtype -%]
>+                                <em>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</em>
>+                            [%- ELSIF hold.object.item_group -%]
>+                                <em>Next available item from group <strong>[% hold.object.item_group.description | html %]</strong></em>
>+                            [%- ELSE -%]
>+                                <em>Next available</em>
>+                            [%- END -%]
>+
>+                            <input type="hidden" name="itemnumber" 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&amp;where=down&amp;first_priority=[% first_priority | uri %]&amp;last_priority=[% last_priority | uri %]&amp;prev_priority=0&amp;next_priority=1&amp;borrowernumber=[% hold.borrowernumber | uri %]&amp;biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]&amp;reserve_id=[% hold.reserve_id | uri %]&amp;date=[% hold.date | uri %]'">
>-                [%- END -%]
>-            </td>
>-            [% IF ( hold.intransit || hold.atdestination ) %]
>-                <td><input class="printholdslip" type="button" name="printholdslip" value="Print slip" data-reserve_id="[% hold.reserve_id | html %]"></td>
>-            [% ELSE %]
>+                    [%- IF hold.non_priority -%]
>+                        <br><i>Non priority hold</i>
>+                    [%- END -%]
>+                </td>
>+                [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
>+                [%- UNLESS hold.found -%]
>+                        <td>
>+                                [% IF ( hold.lowestPriority ) %]
>+                                    <a class="hold-arrow" title="Remove lowest priority" href="request.pl?action=setLowestPriority&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+                                        <i class="fa fa-lg fa-rotate-90 icon-unset-lowest" aria-hidden="true"></i>
>+                                [% ELSE %]
>+                                    <a class="hold-arrow" title="Set lowest priority" href="request.pl?action=setLowestPriority&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+                                        <i class="fa fa-lg fa-rotate-90 icon-set-lowest" aria-hidden="true"></i>
>+                                [% END %]
>+                            </a>
>+                        </td>
>+            [%- ELSE -%]
>                 <td></td>
>-            [% END %]
>-        </tr>
>-    [% END %]
>+            [%- END -%]
>+                [%- END -%]
>+                <td>
>+                    <a class="cancel-hold" title="Cancel hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+                        <i class="fa fa-trash" aria-label="Cancel hold"></i>
>+                    </a>
>+                </td>
>+                <td>
>+                    [% IF Koha.Preference('SuspendHoldsIntranet') %]
>+                        [% UNLESS ( hold.found ) %]
>+                            <button class="btn btn-default btn-xs toggle-suspend" data-reserve-id="[% hold.reserve_id | html %]" data-biblionumber="[% hold.biblionumber | html %]">
>+                                [% IF ( hold.suspend ) %]
>+                                    <i class="fa fa-play" aria-hidden="true"></i> Unsuspend
>+                                [% ELSE %]
>+                                    <i class="fa fa-pause" aria-hidden="true"></i> Suspend
>+                                [% END %]
>+                            </button>
>+
>+                            [% 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 | html %]" class="flatpickr" data-flatpickr-futuredate="true" />
>+                            [%- 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&amp;where=down&amp;first_priority=[% first_priority | uri %]&amp;last_priority=[% last_priority | uri %]&amp;prev_priority=0&amp;next_priority=1&amp;borrowernumber=[% hold.borrowernumber | uri %]&amp;biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]&amp;reserve_id=[% hold.reserve_id | uri %]&amp;date=[% hold.date | uri %]'">
>+                    [%- END -%]
>+                </td>
>+                [% IF ( hold.intransit || hold.atdestination ) %]
>+                    <td><input class="printholdslip" type="button" name="printholdslip" value="Print slip" data-reserve_id="[% hold.reserve_id | html %]"></td>
>+                [% ELSE %]
>+                    <td></td>
>+                [% END %]
>+            </tr>
>+        [% END %]
>+    </tbody>
> </table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index fb095ed66c..d136f5b8f6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -1312,6 +1312,13 @@
>     [% END %]
> 
>     <script>
>+        $(document).ready(function () {
>+            hold_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds', 'patron_holds_table', 'json' ) | $raw %];
>+            KohaTable("patron_holds_table", {
>+                "bPaginate":false,
>+                "bKohaColumnsUseNames": true,
>+           }, hold_table_settings);
>+        });
>         var Sticky;
>         var biblionumbers = [[% biblionumbers.join(', ') | $raw %]];
>         var borrowernumber = "[% patron.borrowernumber | $raw %]";
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33575: 149970 | 150041 | 150187 | 150188 | 150915 | 150916 | 150917 | 158161 | 158162 | 158163