From 03dfc6d702d82b6ffc40e86338d290de0fbbda00 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 4 Jul 2016 13:38:45 +0100 Subject: [PATCH] Bug 16852: Remove GetBorrowerCategorycode And use Koha::Patron->categorycode instead Test plan: - Restrict a patron attribute to a patron category - Use the batch patron modification tool to update a patron of this category You should not see the the patron attribute --- C4/Members.pm | 24 +----------------------- tools/modborrowers.pl | 4 ++-- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index 40b15fa..93c75a2 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -79,8 +79,6 @@ BEGIN { &GetMemberAccountRecords &GetBorNotifyAcctRecord - GetBorrowerCategorycode - &GetBorrowersToExpunge &GetBorrowersWhoHaveNeverBorrowed &GetBorrowersWithIssuesHistoryOlderThan @@ -610,7 +608,7 @@ sub ModMember { } } - my $old_categorycode = GetBorrowerCategorycode( $data{borrowernumber} ); + my $old_categorycode = Koha::Patrons->find( $data{borrowernumber} )->categorycode; # get only the columns of a borrower my $schema = Koha::Database->new()->schema; @@ -1397,26 +1395,6 @@ sub GetUpcomingMembershipExpires { return $results; } -=head2 GetBorrowerCategorycode - - $categorycode = &GetBorrowerCategoryCode( $borrowernumber ); - -Given the borrowernumber, the function returns the corresponding categorycode - -=cut - -sub GetBorrowerCategorycode { - my ( $borrowernumber ) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare( qq{ - SELECT categorycode - FROM borrowers - WHERE borrowernumber = ? - } ); - $sth->execute( $borrowernumber ); - return $sth->fetchrow; -} - =head2 GetAge $dateofbirth,$date = &GetAge($date); diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl index d54ab77..c476711 100755 --- a/tools/modborrowers.pl +++ b/tools/modborrowers.pl @@ -38,6 +38,7 @@ use List::MoreUtils qw /any uniq/; use Koha::DateUtils qw( dt_from_string ); use Koha::List::Patron; use Koha::Patron::Categories; +use Koha::Patrons; my $input = new CGI; my $op = $input->param('op') || 'show_form'; @@ -288,8 +289,7 @@ if ( $op eq 'do' ) { } } - # - my $borrower_categorycode = GetBorrowerCategorycode $borrowernumber; + my $borrower_categorycode = Koha::Patrons->find( $borrowernumber )->categorycode; my $i=0; for ( @attributes ) { my $attribute; -- 2.8.1