From 8c525d75a02685a4b99b50c730ad3bb5311ecd6a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 22 Nov 2021 11:33:25 +0000 Subject: [PATCH] Bug 29504: Allow 'ADDITIONAL_MATERIALS' check to be confirmed The additional materials check when CircConfirmParts is enabled was errantly relying upon the 'FORCE_CHECKOUT' permission. This patch updates the template to allow confirmation as well as cancellation of chekout. Test plan 1. Set a staff member with circ permissions, but not FORCE_CHECKOUT 2. Turn on CircConfirmItemParts 3. Log in as staff member in step 1 4. Attempt to checkout an item with a 952$3 5. The only option given is the Continue button (with a red X) and when clicked, the item does not get checked out. 6. Apply patch 7. Repeat step 4. 8. You should now have the option to 'Yes, check out (Y)' or 'No, don't check out (N)' Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 49ef741405d0b81ba0cb37dd81fa9a4b5aba5bbb) Signed-off-by: Lucas Gass (cherry picked from commit 39f89b43fd0a1083b85b4902b4338aee04224a44) Signed-off-by: Arthur Suzuki (cherry picked from commit cf1afb56857b2a7faffd2f8dfd5accb2ed845f95) Signed-off-by: Victor Grousset/tuxayo --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c01cc8e0ed..732252a491 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 %] + [% IF CAN_user_circulate_force_checkout or HIGHHOLDS or ADDITIONAL_MATERIALS %]
@@ -327,7 +327,7 @@ - [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %] + [% IF CAN_user_circulate_force_checkout or HIGHHOLDS or ADDITIONAL_MATERIALS %] [% IF ( RENEW_ISSUE ) %] [% ELSE %] -- 2.39.5