From a1e5c6b93a65c61c3d0bce5eee98572164c3f31c Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 7 Sep 2018 14:55:23 +0000 Subject: [PATCH] Bug 19469: (RM follow-up) Add filters and fix variable name --- .../data/mysql/atomicupdate/split_holds_queue.sql | 3 - .../intranet-tmpl/prog/en/includes/holds_table.inc | 84 +++++++++++----------- .../prog/en/modules/reserve/request.tt | 30 ++++---- 3 files changed, 57 insertions(+), 60 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/split_holds_queue.sql diff --git a/installer/data/mysql/atomicupdate/split_holds_queue.sql b/installer/data/mysql/atomicupdate/split_holds_queue.sql deleted file mode 100644 index f612dd4..0000000 --- a/installer/data/mysql/atomicupdate/split_holds_queue.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES -('HoldsSplitQueue','nothing','nothing|branch|itemtype|branch_itemtype','In the staff client, split the holds view by the given criteria','Choice'), -('HoldsSplitQueueNumbering', 'actual', 'actual|virtual', 'If the holds queue is split, decide if the acual priorities should be displayed', 'Choice'); 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 4c31ed1..2c7dd67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -13,7 +13,7 @@ Pickup library Details [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] - Toggle set to lowest priority + Toggle set to lowest priority [% END %]   [% IF SuspendHoldsIntranet %] [% END %] @@ -22,9 +22,9 @@ [% FOREACH hold IN holds %] - - - + + + since [% hold.waiting_date | $KohaDates %] + Item waiting at [% hold.wbrname | html %] since [% hold.waiting_date | $KohaDates %] [% ELSE %] - Waiting to be pulled + Waiting to be pulled [% END %] [% ELSE %] - Item being transferred to [% hold.wbrname %] + Item being transferred to [% hold.wbrname | html %] [% END %] [% ELSE %] [% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %] - [% Branches.GetName(hold.branchcode) %] + [% Branches.GetName(hold.branchcode) | html %] [% ELSE %] + [% hold.barcodenumber | html %] + [% ELSE %] No barcode [% END %] @@ -130,10 +130,10 @@ [% IF ( hold.item_level_hold ) %] Only item - + [% IF ( hold.barcodenumber ) %] - [% hold.barcodenumber %] - + [% hold.barcodenumber | html %] + [% ELSE %] No barcode [% END %] @@ -141,7 +141,7 @@ [% ELSE %] [% IF hold.itemtype %] - Next available [% ItemTypes.GetDescription( hold.itemtype ) %] item + Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item [% ELSE %] Next available [% END %] @@ -153,33 +153,33 @@ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] - + [% IF ( hold.lowestPriority ) %] - Unset lowest priority + Unset lowest priority [% ELSE %] - Set to lowest priority + Set to lowest priority [% END %] [% END %] - - Cancel + + Cancel [% IF SuspendHoldsIntranet %] [% UNLESS ( hold.found ) %] - + [% IF AutoResumeSuspendedHolds %] - - - Clear date + + + Clear date [% ELSE %] - + [% END %] [% ELSE %] 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 de06a44..bf6220d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -508,10 +508,10 @@ [% UNLESS ( patron ) %] [% IF ( reserveloop ) %] -
+ [% IF ( multi_hold ) %] - + [% END %]
@@ -521,7 +521,7 @@ [% IF ( biblioloo.reserveloop ) %] [% IF ( multi_hold ) %]

- + [% biblioloo.title | html %]

@@ -531,7 +531,7 @@ [% SET branchcodes = [] %] [% FOREACH h IN biblioloo.reserveloop %] - [% branchcodes.push( h.branchcode ) %] + [% branchcodes.push( h.branchcode ) | $raw %] [% END %] [% branchcodes = branchcodes.unique %] @@ -539,11 +539,11 @@ [% SET holds_by_branch = [] %] [% FOREACH h IN biblioloo.reserveloop %] [% IF h.branchcode == b %] - [% holds_by_branch.push( h ) %] + [% holds_by_branch.push( h ) | $raw %] [% END %] [% END %]
- [% Branches.GetName( b ) %] + [% Branches.GetName( b ) | html %] [% INCLUDE holds_table.inc holds=holds_by_branch %]
[% END %] @@ -552,7 +552,7 @@ [% FOREACH h IN biblioloo.reserveloop %] [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %] - [% itemtypes_all.push( hold_itemtype ) %] + [% itemtypes.push( hold_itemtype ) | $raw %] [% END %] [% itemtypes = itemtypes.unique %] @@ -561,13 +561,13 @@ [% FOREACH h IN biblioloo.reserveloop %] [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %] [% IF hold_itemtype == i %] - [% holds_by_itemtype.push( h ) %] + [% holds_by_itemtype.push( h ) | $raw %] [% END %] [% END %]
[% IF i %] - [% ItemTypes.GetDescription( i ) %] + [% ItemTypes.GetDescription( i ) | html %] [% ELSE %] Any item type [% END %] @@ -578,31 +578,31 @@ [% SET branchcodes = [] %] [% FOREACH h IN biblioloo.reserveloop %] - [% branchcodes.push( h.branchcode ) %] + [% branchcodes.push( h.branchcode ) | $raw %] [% END %] [% branchcodes = branchcodes.unique %] [% FOREACH b IN branchcodes.sort %]
- [% Branches.GetName( b ) %] + [% Branches.GetName( b ) | html %] [% SET holds_by_branch = [] %] [% FOREACH h IN biblioloo.reserveloop %] [% IF h.branchcode == b %] - [% holds_by_branch.push( h ) %] + [% holds_by_branch.push( h ) | $raw %] [% END %] [% END %] [% SET itemtypes = [] %] [% FOREACH h IN holds_by_branch %] [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %] - [% itemtypes.push( hold_itemtype ) %] + [% itemtypes.push( hold_itemtype ) | $raw %] [% END %] [% itemtypes = itemtypes.unique %] [% FOREACH i IN itemtypes.sort %]
[% IF i %] - [% ItemTypes.GetDescription( i ) %] + [% ItemTypes.GetDescription( i ) | html %] [% ELSE %] Any item type [% END %] @@ -611,7 +611,7 @@ [% FOREACH h IN holds_by_branch %] [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %] [% IF hold_itemtype == i %] - [% holds_by_itemtype.push( h ) %] + [% holds_by_itemtype.push( h ) | $raw %] [% END %] [% END %] [% INCLUDE holds_table.inc holds=holds_by_itemtype %] -- 2.1.4