From e934e5ecb465433e85dde89d6a31d75e62beae99 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 16 Nov 2018 17:23:14 +0000 Subject: [PATCH] Bug 21854: Use template plugin to display category description Rather than getting the description in the script and passing, we should just use the tmeplate plugin to get the description from the category code. To test: 1 - Find a patron, note their category 2 - Visit Tools - Batch patron modification 3 - Enter barcode of patron above 4 - Note category does not show in the display of patrons to be modified 5 - Apply patch 6 - Reload the page, note the patron category displays 7 - Modify the patron (anything but category) 8 - Check that category still diplays correctly in results Signed-off-by: Pierre-Marc Thibault --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt | 3 ++- tools/modborrowers.pl | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index a1a4aee..3f0581a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -3,6 +3,7 @@ [% USE Koha %] [% USE KohaDates %] [% USE Branches %] +[% USE Categories %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Batch patron modification @@ -164,7 +165,7 @@ [% borrower.surname | html %] [% borrower.firstname | html %] [% Branches.GetName( borrower.branchcode ) | html %] - [% borrower.category_description | html %] + [% Categories.GetName(borrower.categorycode) | html %] [% borrower.city | html %] [% borrower.state | html %] [% borrower.zipcode | html %] diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl index 7b8587a..fb672a6 100755 --- a/tools/modborrowers.pl +++ b/tools/modborrowers.pl @@ -336,9 +336,7 @@ if ( $op eq 'do' ) { for my $borrowernumber ( @borrowernumbers ) { my $patron = Koha::Patrons->find( $borrowernumber ); if ( $patron ) { - my $category_description = $patron->category->description; $patron = $patron->unblessed; - $patron->{category_description} = $category_description; $patron->{patron_attributes} = C4::Members::Attributes::GetBorrowerAttributes( $patron->{borrowernumber} ); $max_nb_attr = scalar( @{ $patron->{patron_attributes} } ) if scalar( @{ $patron->{patron_attributes} } ) > $max_nb_attr; @@ -360,7 +358,6 @@ if ( $op eq 'do' ) { $template->param( borrowers => \@borrowers ); $template->param( attributes_header => \@attributes_header ); - $template->param( borrowers => \@borrowers ); $template->param( errors => \@errors ); } else { -- 2.7.4