From a66c9e2944c10c35ec84c54a151bced954fae877 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 7 Sep 2022 11:24:49 +0200 Subject: [PATCH] Bug 35573: Correctly display warning when placing a hold Test plan: 1) Add a basic circulation rule like : 0 hold allowed on patron category 'A' and set AllowHoldPolicyOverride to 'Allow' 2) Make a hold on a patron belongs to this category 3) Normally you should see a warning on item (override needed) but it's not the case 4) Apply this patch 5) Refresh and repeat step 2 This patch comes from an alternative patch on the original bug (I'm including the original test plan for your information) : (Bug 30687 - alternative patch): Always allow to force hold pickup location If AllowHoldPolicyOverride is enabled and only some pickup locations are available, you still have the possibility to force one of the others pickup locations. But when there are zero pickup locations available, that is not possible. This patch change that by always displaying the list of pickup locations when AllowHoldPolicyOverride is enabled. Test plan: 1. Apply patch 2. Disable AllowHoldPolicyOverride 3. Create a biblio B with an item I at library A. 4. Configure this library A to not be a pickup location 5. Add a "Default holds policy by item type" for item I type where "Hold pickup library match" is "item's home library" 6. Try to place a hold on biblio B You should not be able to place a hold because there is no valid pickup locations 7. Enable AllowHoldPolicyOverride 8. Try to place a hold on biblio B You should now see all valid pickup locations in a dropdown list (with an exclamation mark in front of each option) with none selected by default 9. Verify you can place a title-level hold and an item-level hold Signed-off-by: David Nind Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer (cherry picked from commit 805ea1a00e5e05aae71c508947976b0cfff5b81a) Signed-off-by: Fridolin Somers (cherry picked from commit 204b5c76ce3c8ee29b6bd6882c0852fa31fe71d4) Signed-off-by: Lucas Gass --- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 4 ++-- reserve/request.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 67f854104d..69f2c61393 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -789,7 +789,7 @@ [% END # /IF force_hold_level %] - [% IF (itemloo.pickup_locations_count > 0) %] + [% IF (itemloo.pickup_locations_count > 0) || Koha.Preference('AllowHoldPolicyOverride') %]