From ad1ba3604c2054a6d7eb22ff26f3f4a8857683d0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 23 Aug 2019 16:41:57 +0000 Subject: [PATCH] Bug 23502: Staff client "revert status" buttons should not depend on SuspendHoldsIntranet preference This bug corrects the template logic controlling the display of the "Revert waiting status" and "Revert transit status" buttons on the staff client holds page so that it doesn't depend on having SuspendHoldsIntranet enabled. To test, apply the patch and locate a title which has multiple holds, including: - One waiting hold - One in-transit hold - At least one pending hold View the page with the SuspendHoldsIntranet preference both on and off. The "Revert transit status" and "Revert waiting status" buttons should be displayed either way. Signed-off-by: Maryse Simard Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 424cd4ed7f877d8bc7a45c77df0fa1b614efd1b7) Signed-off-by: Fridolin Somers --- .../prog/en/includes/holds_table.inc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 0e0462d232..c40d3e638b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -17,7 +17,7 @@ Toggle set to lowest priority [% END %]   - [% IF SuspendHoldsIntranet %] [% END %] +   [% SET first_priority = 0 %] @@ -188,24 +188,25 @@ - [% IF SuspendHoldsIntranet %] - + + [% IF Koha.Preference('SuspendHoldsIntranet') %] [% UNLESS ( hold.found ) %] - [% IF AutoResumeSuspendedHolds %] + [% IF Koha.Preference('AutoResumeSuspendedHolds') %] Clear date [% ELSE %] [% END %] - - [% ELSE %] - [% END %] - - [% END # IF SuspendHoldsIntranet %] + [% END # IF SuspendHoldsIntranet %] + + [% IF ( hold.found ) %] + + [% END %] + -- 2.39.5