Attachment 14267 Details for Bug 9206 – Bug 9206 - Only allow place holds in records that the patron don't have in his possession - QA Followup

[patch] Bug 9206 - Only allow place holds in records that the patron don't have in his possession - QA Followup

Bug-9206---Only-allow-place-holds-in-records-that-.patch (text/plain), 3.82 KB, created by Jonathan Druart on 2012-12-26 14:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2012-12-26 14:03:17 UTC

Size: 3.82 KB

patch

obsolete

>From 8492b9bfd7687c14aec21bc90e9b70a12205d7a6 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Fri, 14 Dec 2012 09:13:49 -0500
>Subject: [PATCH] Bug 9206 - Only allow place holds in records that the patron
> don't have in his possession - QA Followup
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> C4/Circulation.pm                                       |    1 +
> installer/data/mysql/updatedatabase.pl                  |   15 +++++++--------
> .../prog/en/modules/admin/preferences/circulation.pref  |    2 +-
> reserve/request.pl                                      |    2 ++
> 4 files changed, 11 insertions(+), 9 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 36aff3e..55b89f9 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -83,6 +83,7 @@ BEGIN {
> 		&GetBiblioIssues
> 		&GetOpenIssue
> 		&AnonymiseIssueHistory
>+		&CheckIfIssuedToPatron
> 	);
> 
> 	# subs to deal with returns
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index f78849a..075fc90 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -6111,14 +6111,6 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>     print "Upgrade to $DBversion done (Bug 8782: Add field subscription.closed)\n";
>     SetVersion($DBversion);
> }
>-$DBversion = "XXX";
>-if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>-    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowHoldsOnPatronsPossessions', '1', 'Allow holds on records that patron have items of it',NULL,'YesNo')"
>-    print "Upgrade to $DBversion done (Bug 9206: Only allow place holds in records that the patron don't have in his possession)\n";
>-    SetVersion($DBversion);
>-}
>-
>-
> 
> $DBversion = "3.11.00.005";
> if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>@@ -6317,6 +6309,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>     SetVersion($DBversion);
> }
> 
>+$DBversion = "3.11.00.XXX";
>+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowHoldsOnPatronsPossessions', '1', 'Allow holds on records that patron have items of it',NULL,'YesNo')");
>+    print "Upgrade to $DBversion done (Bug 9206: Only allow place holds in records that the patron don't have in his possession)\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 af3f565..50d808c 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
>@@ -446,7 +446,7 @@ Circulation:
>               choices:
>                   yes: Allow
>                   no: "Don't allow"
>-            - patrons to place holds on records that he already have any item of it in his possession.
>+            - a patron to place a hold on a record where the patron already has one or more items attached to that record checked out.
>     Fines Policy:
>         -
>             - Calculate fines based on days overdue
>diff --git a/reserve/request.pl b/reserve/request.pl
>index d8c99d7..4d1c52e 100755
>--- a/reserve/request.pl
>+++ b/reserve/request.pl
>@@ -247,6 +247,8 @@ foreach my $biblionumber (@biblionumbers) {
>  		$warnings = 1;
>         $maxreserves = 1;
>     }
>+    
>+    my $alreadypossession;
>     if (not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowerinfo->{borrowernumber},$biblionumber)) {
>         $warnings = 1;
>         $alreadypossession = 1;
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9206: 13881 | 14126 | 14127 | 14266 | 14267 | 14268