From dc7a1a72641ea812e7811e8d0a3eeb6bde7d2880 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 15 Dec 2021 09:20:52 +0000 Subject: [PATCH] Bug 29504: (follow-up) Account for other blockers Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 7a7716b6d8039476a6cc2d6403092cc2df42458e) Signed-off-by: Lucas Gass (cherry picked from commit 3eceb3d5fe9c8c5ae6ce04720364acd21be0a7e6) Signed-off-by: Arthur Suzuki (cherry picked from commit 96a6472747ae77e5415fddb9824b003ce3998494) Signed-off-by: Victor Grousset/tuxayo --- .../prog/en/modules/circ/circulation.tt | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 732252a491..ba73c368a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -234,7 +234,7 @@ [% END %] - [% IF CAN_user_circulate_force_checkout or HIGHHOLDS or ADDITIONAL_MATERIALS %] + [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
@@ -311,6 +311,30 @@
[% END # /IF CAN_user_circulate_force_checkout or HIGHHOLDS %] + [% IF ADDITIONAL_MATERIALS && !CAN_user_circulate_force_checkout %] +
+ + + [% IF (forceallow) %][% END %] + + + + + + + + + [% IF ( RENEW_ISSUE ) %] + + [% ELSE %] + + [% END %] + + + +
+ [% END # /IF ADDITIONAL_MATERIALS %] + [% IF ( RESERVED or RESERVE_WAITING or TRANSFERRED or PROCESSING ) %]
-- 2.39.5