Bugzilla – Attachment 87674 Details for
Bug 20837
CanItemBeReserved should follow ReservesControlBranch and not CircControl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20837: Use ReservesControlBranch to determine holdability of items
Bug-20837-Use-ReservesControlBranch-to-determine-h.patch (text/plain), 4.28 KB, created by
Liz Rea
on 2019-04-09 19:36:10 UTC
(
hide
)
Description:
Bug 20837: Use ReservesControlBranch to determine holdability of items
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2019-04-09 19:36:10 UTC
Size:
4.28 KB
patch
obsolete
>From 4ababfe0a9efe219b7d66322373d6240eb920a62 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 30 May 2018 16:05:04 +0000 >Subject: [PATCH] Bug 20837: Use ReservesControlBranch to determine holdability > of items > >To test: > 1 - Set a default holds plicy for an item type as 'from home library' > 2 - Set CircControl to 'logged in library' > 3 - Log in as staff from a library without the rule set > 4 - Note you can set holds for patrons of any library on items of type >above > 5 - Toggle ReservesControlBranch and note that nothing changes > 6 - Toggle CircControl and note some combinations don't allow holds > 7 - Apply patch > 8 - Toggle ReservesControlBranch and note that holdability is affected > 9 - Toggle CircControl and note holdability does not change >10 - Read the note on admin/smartrules.pl and confirm it makes sense >--- > C4/Reserves.pm | 15 ++++++--------- > .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 3 ++- > 2 files changed, 8 insertions(+), 10 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 09d36288e3..098c799101 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -442,10 +442,10 @@ sub CanItemBeReserved { > return { status => 'tooManyReserves', limit => $rule->rule_value} if $total_holds_count >= $rule->rule_value; > } > >- my $circ_control_branch = >- C4::Circulation::_GetCircControlBranch( $item->unblessed(), $borrower ); >+ my $reserves_control_branch = >+ GetReservesControlBranch( $item->unblessed(), $borrower ); > my $branchitemrule = >- C4::Circulation::GetBranchItemRule( $circ_control_branch, $item->itype ); # FIXME Should not be item->effective_itemtype? >+ C4::Circulation::GetBranchItemRule( $reserves_control_branch, $item->itype ); # FIXME Should not be item->effective_itemtype? > > if ( $branchitemrule->{holdallowed} == 0 ) { > return { status => 'notReservable' }; >@@ -1173,9 +1173,7 @@ sub IsAvailableForItemLevelRequest { > my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ); > my $item_object = Koha::Items->find( $item->{itemnumber } ); > my $itemtype = $item_object->effective_itemtype; >- my $notforloan_per_itemtype >- = $dbh->selectrow_array("SELECT notforloan FROM itemtypes WHERE itemtype = ?", >- undef, $itemtype); >+ my $notforloan_per_itemtype = Koha::ItemTypes->find($itemtype)->notforloan; > > return 0 if > $notforloan_per_itemtype || >@@ -1202,9 +1200,8 @@ sub IsAvailableForItemLevelRequest { > my $any_available = 0; > > foreach my $i (@items) { >- >- my $circ_control_branch = C4::Circulation::_GetCircControlBranch( $i->unblessed(), $borrower ); >- my $branchitemrule = C4::Circulation::GetBranchItemRule( $circ_control_branch, $i->itype ); >+ my $reserves_control_branch = GetReservesControlBranch( $i->unblessed(), $borrower ); >+ my $branchitemrule = C4::Circulation::GetBranchItemRule( $reserves_control_branch, $i->itype ); > > $any_available = 1 > unless $i->itemlost >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index e41d59b655..4b60a4cc0c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -1,5 +1,6 @@ > [% USE raw %] > [% USE Asset %] >+[% USE Koha %] > [% USE Branches %] > [% USE Categories %] > [% USE CirculationRules %] >@@ -687,7 +688,7 @@ > <li><strong>No holds allowed:</strong> No patron may put this book on hold.</li> > </ul> > <p><strong>Note: </strong>If the system preference 'AllowHoldPolicyOverride' is enabled, these policies can be overridden by your circulation staff.</br /> >- <strong>Important: </strong>The policies are based on the patron's home library, not the library where the hold is being placed. >+ <strong>Important: </strong>The policies are applied based on the ReservesControlBranch system preference which is set to <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReservesControlBranch">[% Koha.Preference('ReservesControlBranch') %]</a>. > </p> > > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >-- >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 20837
:
75684
|
75685
|
87021
|
87022
|
87023
|
87024
|
87025
|
87409
|
87410
|
87673
|
87674
|
87675
|
88699
|
88700
|
88701