Bugzilla – Attachment 30240 Details for
Bug 10446
System preference maxoutstanding is poorly named
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10446 - System preference maxoutstanding is poorly named
Bug-10446---System-preference-maxoutstanding-is-po.patch (text/plain), 5.01 KB, created by
Mark Tompsett
on 2014-07-29 02:44:52 UTC
(
hide
)
Description:
Bug 10446 - System preference maxoutstanding is poorly named
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2014-07-29 02:44:52 UTC
Size:
5.01 KB
patch
obsolete
>From afdd79f653ae1e01c16cccac4a4b707841bf5324 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 11 Jun 2013 10:18:16 -0400 >Subject: [PATCH] Bug 10446 - System preference maxoutstanding is poorly named > >The system preference 'maxoutstanding' is defined as the maximum amount >of fees owed by the patron before Koha should block placing holds, but >the name does not describe its behavior very well. > >String changes only, no functional changes made. > >Test Plan: >1) Apply patch >2) Run updatedatabase.pl >3) Verify the new system preference FeesBlockHoldsAmount's value matches > the previous value of maxoutstanding. >4) Set FeesBlockHoldsAmount to $10 >5) Attempt to place an OPAC hold for a patron owing less than $10 > This attempt should succeed. >6) Attempt to place an OPAC hold for a patron owing more than $10 > This attempt should fail > >Signed-off-by: Srdjan <srdjan@catalyst.net.nz> >--- > C4/SIP/ILS/Patron.pm | 2 +- > installer/data/mysql/sysprefs.sql | 2 +- > installer/data/mysql/updatedatabase.pl | 8 ++++++++ > .../en/modules/admin/preferences/circulation.pref | 2 +- > opac/opac-reserve.pl | 6 +++--- > 5 files changed, 14 insertions(+), 6 deletions(-) > >diff --git a/C4/SIP/ILS/Patron.pm b/C4/SIP/ILS/Patron.pm >index 4ccd21b..215bdd0 100644 >--- a/C4/SIP/ILS/Patron.pm >+++ b/C4/SIP/ILS/Patron.pm >@@ -349,7 +349,7 @@ sub excessive_fines { > sub holds_blocked_by_excessive_fees { > my $self = shift; > return ( $self->fee_amount >- && $self->fee_amount > C4::Context->preference("maxoutstanding") ); >+ && $self->fee_amount > C4::Context->preference("FeesBlockHoldsAmount") ); > } > > sub library_name { >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index d820b94..d290d04 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -187,7 +187,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('MaxFine',NULL,'','Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','Integer'), > ('MaxItemsForBatch','1000',NULL,'Max number of items record to process in a batch (modification or deletion)','Integer'), > ('maxItemsInSearchResults','20',NULL,'Specify the maximum number of items to display for each result on a page of results','free'), >-('maxoutstanding','5','','maximum amount withstanding to be able make holds','Integer'), >+('FeesBlockHoldsAmount','5','','maximum amount withstanding to be able make holds','Integer'), > ('maxRecordsForFacets','20',NULL,NULL,'Integer'), > ('maxreserves','50','','Define maximum number of holds a patron can place','Integer'), > ('minPasswordLength','3',NULL,'Specify the minimum length of a patron/staff password','free'), >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 94bb4ff..fb8e386 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8577,6 +8577,14 @@ if ( CheckVersion($DBversion) ) { > SetVersion ($DBversion); > } > >+$DBversion = "3.17.00.XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do("UPDATE systempreferences SET variable = 'FeesBlockHoldsAmount' WHERE variable = 'maxoutstanding'"); >+ print "Upgrade to $DBversion done (Bug 10446 - System preference maxoutstanding is poorly named)\n"; >+ SetVersion($DBversion); >+} >+ >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 55d8a78..6b1dae2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -260,7 +260,7 @@ Circulation: > - a renewal notice according to patron checkout alert preferences. > - > - Prevent patrons from making holds on the OPAC if they owe more than >- - pref: maxoutstanding >+ - pref: FeesBlockHoldsAmount > class: currency > - '[% local_currency %] in fines.' > - >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index 94ff1bd..6219894 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -297,9 +297,9 @@ if ( $query->param('place_reserve') ) { > # > # > my $noreserves = 0; >-my $maxoutstanding = C4::Context->preference("maxoutstanding"); >-$template->param( noreserve => 1 ) unless $maxoutstanding; >-if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $maxoutstanding) ) { >+my $FeesBlockHoldsAmount = C4::Context->preference("FeesBlockHoldsAmount"); >+$template->param( noreserve => 1 ) unless $FeesBlockHoldsAmount; >+if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $FeesBlockHoldsAmount) ) { > my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'}; > $template->param( message => 1 ); > $noreserves = 1; >-- >1.7.9.5
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 10446
:
18846
|
19903
|
26618
|
30239
|
30240
|
30241
|
32757
|
32758