From 391e7f7188472f3399007c836c0605cfc1277a30 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
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 <pierre-marc.thibault@inLibro.com>
Signed-off-by: Andreas Roussos <arouss1980@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit df68391a5ec2eac05a88373dc10c136c8d057e98)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
---
 .../prog/en/modules/tools/modborrowers.tt     | 27 ++++++++++---------
 tools/modborrowers.pl                         |  3 ---
 2 files changed, 14 insertions(+), 16 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 c00a1a5598..db8c92335e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -2,6 +2,7 @@
 [% USE Koha %]
 [% USE KohaDates %]
 [% USE Branches %]
+[% USE Categories %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Tools &rsaquo; Batch patron modification</title>
@@ -158,19 +159,19 @@
                                                     [% IF ( op == 'show' ) %]
                                                         <td><input type="checkbox" name="borrowernumber" value="[% borrower.borrowernumber %]" checked="checked" /></td>
                                                     [% END %]
-                                                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.cardnumber %]</a></td>
-                                                    <td>[% borrower.surname %]</td>
-                                                    <td>[% borrower.firstname %]</td>
-                                                    <td>[% Branches.GetName( borrower.branchcode ) %]</td>
-                                                    <td>[% borrower.category_description %]</td>
-                                                    <td>[% borrower.city %]</td>
-                                                    <td>[% borrower.state %]</td>
-                                                    <td>[% borrower.zipcode %]</td>
-                                                    <td>[% borrower.country %]</td>
-                                                    <td><span title="[% borrower.dateenrolled %]">[% borrower.dateenrolled | $KohaDates %]</span></td>
-                                                    <td><span title="[% borrower.dateexpiry %]">[% borrower.dateexpiry | $KohaDates %]</span></td>
-                                                    <td>[% borrower.borrowernotes %]</td>
-                                                    <td>[% borrower.opacnote %]</td>
+                                                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]">[% borrower.cardnumber | html %]</a></td>
+                                                    <td>[% borrower.surname | html %]</td>
+                                                    <td>[% borrower.firstname | html %]</td>
+                                                    <td>[% Branches.GetName( borrower.branchcode ) | html %]</td>
+                                                    <td>[% Categories.GetName(borrower.categorycode) | html %]</td>
+                                                    <td>[% borrower.city | html %]</td>
+                                                    <td>[% borrower.state | html %]</td>
+                                                    <td>[% borrower.zipcode | html %]</td>
+                                                    <td>[% borrower.country | html %]</td>
+                                                    <td><span title="[% borrower.dateenrolled | html %]">[% borrower.dateenrolled | $KohaDates %]</span></td>
+                                                    <td><span title="[% borrower.dateexpiry | html %]">[% borrower.dateexpiry | $KohaDates %]</span></td>
+                                                    <td>[% borrower.borrowernotes | html %]</td>
+                                                    <td>[% borrower.opacnote | html %]</td>
                                                     [% FOREACH pa IN borrower.patron_attributes %]
                                                         [% IF ( pa.code ) %]
                                                             <td>[% pa.code %]=[% pa.value %]</td>
diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index e53e3a30d7..dd7df5f02a 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.20.1