Bugzilla – Attachment 164252 Details for
Bug 35573
Koha is not correctly warning of overridden items when placing a hold if AllowHoldPolicyOverride
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35573: Correctly display warning when placing a hold
Bug-35573-Correctly-display-warning-when-placing-a.patch (text/plain), 5.08 KB, created by
Nick Clemens (kidclamp)
on 2024-04-02 11:09:57 UTC
(
hide
)
Description:
Bug 35573: Correctly display warning when placing a hold
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2024-04-02 11:09:57 UTC
Size:
5.08 KB
patch
obsolete
>From 913e9d0e0c297c414a185aa9b9dd4bb2c4f279fe Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >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 <david@davidnind.com> >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > 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 9e95b1bf90c..2fc4460c13e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -782,7 +782,7 @@ > [% END # /IF force_hold_level %] > </td> > <td> >- [% IF (itemloo.pickup_locations_count > 0) %] >+ [% IF (itemloo.pickup_locations_count > 0) || Koha.Preference('AllowHoldPolicyOverride') %] > <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" style="width:100%;" > data-item-id="[% itemloo.itemnumber | html %]" > data-patron-id="[% patron.borrowernumber | html %]" >@@ -1522,7 +1522,7 @@ > msg = (_("- Please select an item to place a hold") + "\n"); > } > } else { >- if( $("#pickup").length < 1 || $("#pickup").val() == "" ){ >+ if( $("#pickup").length < 1 || $("#pickup").val() == "" || $('#pickup').val() === null ){ > msg = _("- Please select a pickup location for this hold" + "\n"); > } > } >diff --git a/reserve/request.pl b/reserve/request.pl >index 7de7512a563..128aa281533 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -511,7 +511,7 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) > # Send the pickup locations count to the UI, the pickup locations will be pulled using the API > my $pickup_locations = $item_object->pickup_locations({ patron => $patron }); > $item->{pickup_locations_count} = $pickup_locations->count; >- if ( $item->{pickup_locations_count} > 0 ) { >+ if ( $item->{pickup_locations_count} > 0 || C4::Context->preference('AllowHoldPolicyOverride') ) { > $num_items_available++; > $item->{available} = 1; > # pass the holding branch for use as default >@@ -533,7 +533,7 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) > my @pickup_locations = $item_object->pickup_locations({ patron => $patron })->as_list; > $item->{pickup_locations_count} = scalar @pickup_locations; > >- if ( @pickup_locations ) { >+ if ( @pickup_locations || C4::Context->preference('AllowHoldPolicyOverride') ) { > $num_items_available++; > $item->{override} = 1; > >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35573
:
161758
|
161759
|
162304
|
162305
|
164251
| 164252