From: Kyle M Hall <kyle@bywatetsolutions.com>
Date: Wed, 18 Apr 2018 15:18:35 +0000 (-0400)
Subject: Bug 9302: Use patron-title.inc
X-Git-Tag: v18.05.00-rc1~194
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=7319f1526b73729c51f2c5405d37de4a7809ea39;p=koha_ffzg

Bug 9302: Use patron-title.inc

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
index b87ac412f8..6deeae6fc3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
@@ -70,7 +70,7 @@
                                 <tr>
                                     <td><input class='keeper' type='radio' name='keeper' value='[% p.id %]' /></td>
                                     <td>[% p.cardnumber | html %]</td>
-                                    <td>[% p.firstname | html %] [% p.surname | html %]</td>
+                                    <td>[% INCLUDE 'patron-title.inc' patron = p %]</td>
                                     <td>[% p.dateofbirth | $KohaDates %]</td>
                                     <td>[% Categories.GetName( p.categorycode ) %] ([% p.categorycode %])</td>
                                     <td>[% Branches.GetName( p.branchcode ) %]</td>
@@ -95,13 +95,13 @@
                     <div class="dialog alert">Merge failed! The following error was reported: [% error %].</div>
                 [% ELSE %]
                     <p>
-                        Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id %]">[% keeper.firstname %] [% keeper.surname %] ([% keeper.cardnumber | html %])</a>
+                        Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id %]">[% INCLUDE 'patron-title.inc' patron = keeper %]</a>
                     </p>
 
                     [% FOREACH pair IN results.merged.pairs %]
                         [% SET patron = pair.value.patron %]
 
-                        <h5>[% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</h5>
+                        <h5>[% INCLUDE 'patron-title.inc' %]</h5>
 
                         [% FOREACH r IN pair.value.updated.pairs %]
                             [% SET name = r.key %]