From ff651b84e8d99496bc330c4e8e0925234f30def9 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 11 Mar 2019 08:33:13 +0000 Subject: [PATCH] Bug 13094: Make it easy to hide 'Cancel all' button on holds over report This patch makes some small modifications to the 'Holds awaiting pickup' report: - Fixes typo sypref - Fixes 'Home branch' to 'Home library' - Adds a span to easily hide the cancel all button with CSS To test: - Make sure you have a hold appearing on the awaiting pickup list second tab: Holds waiting over... - Verify the 'cancel all' button on top shows - Verify syspref and Home library changes mentioned above - Add #holdsover-cancel-all { display:none; } to IntrentUserCSS - Verify that the button and the text have vanished Note: If the text doesn't display next to the button, try toggling the TransferWhenCancelAllWaitingHolds system preference. Signed-off-by: Liz Rea Signed-off-by: Chris Cormack Signed-off-by: Martin Renvoize (cherry picked from commit 39e4c6c5d791853985773e4032357372f77d7587) Signed-off-by: Fridolin Somers --- .../prog/en/includes/waiting_holds.inc | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 37 ++++++++++--------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index 1639197d7b..2bdf8c7c1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -7,7 +7,7 @@ Date hold placed Title Patron - Home branch + Home library Current location Shelving location Call number diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 8694b77c8a..6bc433117f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -79,26 +79,27 @@ [% END %]
- [% IF ( ReservesMaxPickUpDelay ) %]

Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.

[% END %] - [% IF ( overloop ) %] -
- - - - [% IF TransferWhenCancelAllWaitingHolds %] - - [% ELSE %] - + [% IF ( ReservesMaxPickUpDelay ) %]

Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.

[% END %] + [% IF ( overloop ) %] + + + + + + [% IF TransferWhenCancelAllWaitingHolds %] + + [% ELSE %] + + [% END %] + + [% UNLESS TransferWhenCancelAllWaitingHolds %] + Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref) [% END %] - - [% UNLESS TransferWhenCancelAllWaitingHolds %] - Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref) - [% END %] - +
[% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop %] - [% ELSE %] -
No holds found.
- [% END %] + [% ELSE %] +
No holds found.
+ [% END %]
[% END %] -- 2.39.5