From 7ca36827006fdb6731e7ce8c03392dec20c66863 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 23 Dec 2022 15:04:26 +0000 Subject: [PATCH] Bug 30687: [alternate-alternate] Allow pickup locatoin to be forced when override is allowed This is Julian's patch with some extra cleanup to reduce repeated code 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 --- .../prog/en/modules/reserve/request.tt | 4 +- reserve/request.pl | 54 ++++++++----------- 2 files changed, 23 insertions(+), 35 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 e2d33c5415..a9b88388a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -799,7 +799,7 @@ [% END # /IF force_hold_level %] - [% IF (itemloo.pickup_locations_count > 0) %] + [% IF (itemloo.pickup_locations_count > 0) || itemloo.override %]