From 013ff5ba72a07f1995c1923a2478875d7b09b79a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 20 May 2014 16:07:17 +0200 Subject: [PATCH] Bug 12292: (followup) ensure that patrons are not restricted even when the last restriction has expired This is the same issue as bug 12134. Test Plan: 1) Add a manual restriction to a patron and wait until the expiration date of the restriction has passed. This can be simulated by modifying borrowers.debarred for a borrower and setting the date in the past. 2) Go on the detail page for a patron (members/moremember.pl) 3) Note the warning message "Patron is restricted until XX/XX/XXXX View restrictions" 4) Apply this patch 5) Repeat step 2 6) Note the warning message does not appear anymore --- members/moremember.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/members/moremember.pl b/members/moremember.pl index d78cc1f..4f77854 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -51,7 +51,7 @@ use C4::Branch; # GetBranchName use C4::Form::MessagingPreferences; use List::MoreUtils qw/uniq/; use C4::Members::Attributes qw(GetBorrowerAttributes); -use Koha::Borrower::Debarments qw(GetDebarments); +use Koha::Borrower::Debarments qw(GetDebarments IsDebarred); #use Smart::Comments; #use Data::Dumper; use DateTime; @@ -146,9 +146,9 @@ for (qw(gonenoaddress lost borrowernotes)) { $data->{$_} and $template->param(flagged => 1) and last; } -my $debar = $data->{'debarred'}; -if ($debar) { +if ( IsDebarred($borrowernumber) ) { $template->param( 'userdebarred' => 1, 'flagged' => 1 ); + my $debar = $data->{'debarred'}; if ( $debar ne "9999-12-31" ) { $template->param( 'userdebarreddate' => C4::Dates::format_date($debar) ); $template->param( 'debarredcomment' => $data->{debarredcomment} ); -- 2.0.0.rc2