From 0355b6b76e1fed58c39c49827c48a0f0d3625952 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 6 Mar 2020 15:06:02 +0000
Subject: [PATCH] Bug 23433: Make consistent use of patron-title.inc in hold
 confirmation dialogs

Use of patron-title.inc on the checkin page is inconsistent, resulting
in patron names being displayed differently under different
circumstances. This patch makes it more consistent.

To test, apply the patch and check in items with the following statuses:

 - On hold for a patron at your library
 - On hold for a patron not at your library
 - On hold and already marked 'Waiting'
 - On hold while HoldsAutoFill preference is enabled
 - An item which has been marked with a LOST status in the
   'ClaimReturnedLostValue' system preference.
 - An item which was checked out to a manually-restricted patron and
   checked in with a back-dated checkin date. See test plan on Bug
   24776.
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 2a9717e891..e9e6b81ee7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -163,9 +163,7 @@
                                         [% FOREACH rc IN ReturnClaims %]
                                             [% SET patron = rc.patron %]
                                             <li>
-                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">
-                                                    [% patron.firstname | html %] [% patron.surname | html %]
-                                                </a>
+                                                [% INCLUDE 'patron-title.inc' hide_patron_infos_if_needed=1 invert_name=1 %]
                                             </li>
                                         [% END %]
                                     </ul>
@@ -184,9 +182,7 @@
                             [% IF return_date_was_overriden && issue.patron.is_debarred %]
                                 <div id="restricted_backdated" class="dialog message">
                                     <h3>
-                                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issue.patron.borrowernumber | uri %]">
-                                            [% issue.patron.firstname | html %] [% issue.patron.surname | html %]
-                                        </a>
+                                        [% INCLUDE 'patron-title.inc' patron=issue.patron hide_patron_infos_if_needed=1 invert_name=1 %]
                                         is restricted. Please verify this patron should still be restricted.
                                     </h3>
                                 </div>
@@ -418,7 +414,7 @@
                                                     <h4>Hold for:</h4>
                                                     <ul>
                                                         <li>
-                                                            [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]
+                                                            [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_reserves" %]
                                                             <span class="patron-category"> - [% patron.category.description | html %]</span>
                                                         </li>
                                                         [% INCLUDE display_holdpatron_address %]
@@ -576,7 +572,7 @@
                                                     <h5>Hold for:</h5>
                                                     <ul>
                                                         <li>
-                                                            [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]
+                                                            [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_reserves" %]
                                                             <span class="patron-category"> - [% patron.category.description | html %]</span>
                                                         </li>
 
@@ -854,9 +850,7 @@
                                         </td>
                                         <td class="ci-patron">
                                             [% IF ( riloo.duedate ) %]
-                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]">
-                                                    [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %])
-                                                </a>
+                                                [% INCLUDE 'patron-title.inc' patron=riloo.patron hide_patron_infos_if_needed=1 invert_name=1 %]
                                                 [% IF riloo.borissuescount %]
                                                     <span class="results_summary nowrap">
                                                         <span class="label">Checkouts:</span>
-- 
2.11.0