gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 df68391a5e)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit 391e7f7188)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens 2018-11-16 17:23:14 +00:00 committed by Fridolin Somers
parent 128b073685
commit 54e1078dec
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
View File

@ -1,6 +1,7 @@
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% USE Categories %]
[% INCLUDE 'doc-head-open.inc'%]
<title>Koha &rsaquo; Tools &rsaquo; Batch patron modification</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -286,19 +287,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>

1
tools/modborrowers.pl
View File

@ -348,7 +348,6 @@ if ( $op eq 'do' ) {
$template->param( borrowers => \@borrowers );
$template->param( attributes_header => \@attributes_header );
$template->param( borrowers => \@borrowers );
$template->param( errors => \@errors );
} else {