Bugzilla – Attachment 67120 Details for
Bug 19300
Move C4::Reserves::OPACItemHoldsAllowed to the Koha namespace
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19300: Replace C4::Reserves::OPACItemHoldsAllowed
Bug-19300-Replace-C4ReservesOPACItemHoldsAllowed.patch (text/plain), 7.34 KB, created by
Jonathan Druart
on 2017-09-13 19:22:26 UTC
(
hide
)
Description:
Bug 19300: Replace C4::Reserves::OPACItemHoldsAllowed
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-09-13 19:22:26 UTC
Size:
7.34 KB
patch
obsolete
>From 6b18d021e394f5e856a9d7a2af54266a520eb84e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 11 Sep 2017 14:15:41 -0300 >Subject: [PATCH] Bug 19300: Replace C4::Reserves::OPACItemHoldsAllowed > >This patchset move The OPACItemHoldsAllowed logic >(issuingrules.opacitemholds) to a new class method of >Koha::IssuingRules: get_opacitemholds_policy > >On the way, this patch will certainly fix the same problem as bug >19298 with onshelfholds. > >Test plan: >Make sure the opacitemholds policy is correct when placing a hold at the >OPAC or the staff interface. >--- > Koha/IssuingRules.pm | 21 +++++++++++++++++++-- > .../prog/en/modules/reserve/request.tt | 2 +- > opac/opac-reserve.pl | 8 +++++--- > reserve/request.pl | 6 ++++-- > t/db_dependent/Koha/IssuingRules.t | 4 ++-- > 5 files changed, 31 insertions(+), 10 deletions(-) > >diff --git a/Koha/IssuingRules.pm b/Koha/IssuingRules.pm >index 20bbb45cd8..f3da6e21e8 100644 >--- a/Koha/IssuingRules.pm >+++ b/Koha/IssuingRules.pm >@@ -71,6 +71,16 @@ sub get_effective_issuing_rule { > return $rule; > } > >+=head3 get_opacitemholds_policy >+ >+my $can_place_a_hold_at_item_level = Koha::IssuingRules->get_opacitemholds_policy( { patron => $patron, item => $item } ); >+ >+Return 'Y' or 'F' if the patron can place a hold on this item according to the issuing rules >+and the "Item level holds" (opacitemholds). >+Can be 'N' - Don't allow, 'Y' - Allow, and 'F' - Force >+ >+=cut >+ > sub get_opacitemholds_policy { > my ( $class, $params ) = @_; > >@@ -79,8 +89,15 @@ sub get_opacitemholds_policy { > > return unless $item or $patron; > >- require C4::Reserves; >- return C4::Reserves::OPACItemHoldsAllowed( $item->unblessed, $patron->unblessed ); >+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule( >+ { >+ categorycode => $patron->categorycode, >+ itemtype => $item->effective_itemtype, >+ branchcode => $item->homebranch, >+ } >+ ); >+ >+ return $issuing_rule ? $issuing_rule->opacitemholds : undef; > } > > =head3 type >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 02c50b9c2d..05bbc3f3a4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -584,7 +584,7 @@ function checkMultiHold() { > Not on hold > [% END %] > >- [% IF itemloo.item_level_holds == "" %] >+ [% IF itemloo.item_level_holds == "N" %] > <br/>Item level hold not allowed from OPAC > [% ELSIF itemloo.item_level_holds == "F" %] > <br/>Item level hold forced from OPAC >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index 95204b3f5c..dcaec358af 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -36,6 +36,7 @@ use C4::Debug; > use Koha::AuthorisedValues; > use Koha::Biblios; > use Koha::DateUtils; >+use Koha::IssuingRules; > use Koha::Items; > use Koha::ItemTypes; > use Koha::Checkouts; >@@ -446,6 +447,7 @@ foreach my $biblioNum (@biblionumbers) { > my $numCopiesOPACAvailable = 0; > foreach my $itemInfo (@{$biblioData->{itemInfos}}) { > my $itemNum = $itemInfo->{itemnumber}; >+ my $item = Koha::Items->find( $itemNum ); > my $itemLoopIter = {}; > > $itemLoopIter->{itemnumber} = $itemNum; >@@ -475,7 +477,6 @@ foreach my $biblioNum (@biblionumbers) { > } > > # checking reserve >- my $item = Koha::Items->find( $itemNum ); > my $holds = $item->current_holds; > > if ( my $first_hold = $holds->next ) { >@@ -539,10 +540,11 @@ foreach my $biblioNum (@biblionumbers) { > CanItemBeReserved($borrowernumber,$itemNum) eq 'OK'; > > if ($policy_holdallowed) { >- if ( my $hold_allowed = OPACItemHoldsAllowed( $itemInfo, $patron_unblessed ) ) { >+ my $opac_hold_policy = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } ); >+ if ( $opac_hold_policy ne 'N' ) { # If Y or F > $itemLoopIter->{available} = 1; > $numCopiesOPACAvailable++; >- $biblioLoopIter{force_hold} = 1 if $hold_allowed eq 'F'; >+ $biblioLoopIter{force_hold} = 1 if $opac_hold_policy eq 'F'; > } > $numCopiesAvailable++; > >diff --git a/reserve/request.pl b/reserve/request.pl >index 3930e2714d..3bafa067d0 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -47,6 +47,7 @@ use Koha::Biblios; > use Koha::DateUtils; > use Koha::Checkouts; > use Koha::Holds; >+use Koha::IssuingRules; > use Koha::Items; > use Koha::ItemTypes; > use Koha::Libraries; >@@ -396,7 +397,8 @@ foreach my $biblionumber (@biblionumbers) { > } > > # checking reserve >- my $holds = Koha::Items->find( $itemnumber )->current_holds; >+ my $item_object = Koha::Items->find( $itemnumber ); >+ my $holds = $item_object->current_holds; > if ( my $first_hold = $holds->next ) { > my $p = Koha::Patrons->find( $first_hold->borrowernumber ); > >@@ -468,7 +470,7 @@ foreach my $biblionumber (@biblionumbers) { > my $can_item_be_reserved = CanItemBeReserved( $patron->borrowernumber, $itemnumber ); > $item->{not_holdable} = $can_item_be_reserved unless ( $can_item_be_reserved eq 'OK' ); > >- $item->{item_level_holds} = OPACItemHoldsAllowed( $item, $patron_unblessed); >+ $item->{item_level_holds} = Koha::IssuingRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } ); > > if ( > !$item->{cantreserve} >diff --git a/t/db_dependent/Koha/IssuingRules.t b/t/db_dependent/Koha/IssuingRules.t >index 0907a94239..b1c97bfa4d 100644 >--- a/t/db_dependent/Koha/IssuingRules.t >+++ b/t/db_dependent/Koha/IssuingRules.t >@@ -274,7 +274,7 @@ subtest 'get_opacitemholds_policy' => sub { > is ( $opacitemholds, 'Y', 'Patrons can place a hold on this itype'); > t::lib::Mocks::mock_preference('item-level_itypes', 0); > $opacitemholds = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } ); >- is ( $opacitemholds, '', 'Patrons cannot place a hold on this itemtype'); >+ is ( $opacitemholds, 'N', 'Patrons cannot place a hold on this itemtype'); > > Koha::IssuingRules->delete; > Koha::IssuingRule->new({categorycode => '*', itemtype => '*', branchcode => '*', opacitemholds => "N"})->store; >@@ -282,7 +282,7 @@ subtest 'get_opacitemholds_policy' => sub { > Koha::IssuingRule->new({categorycode => '*', itemtype => $itemtype->itemtype, branchcode => '*', opacitemholds => "Y"})->store; > t::lib::Mocks::mock_preference('item-level_itypes', 1); > $opacitemholds = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } ); >- is ( $opacitemholds, '', 'Patrons cannot place a hold on this itype'); >+ is ( $opacitemholds, 'N', 'Patrons cannot place a hold on this itype'); > t::lib::Mocks::mock_preference('item-level_itypes', 0); > $opacitemholds = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } ); > is ( $opacitemholds, 'Y', 'Patrons can place a hold on this itemtype'); >-- >2.11.0
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 19300
:
67119
|
67120
|
67121
|
67388
|
67389
|
67390
|
70101
|
70102
|
70103