From b9cfa36d475e0f897398228a1cfe8b0a71b4d227 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/en/modules/circ/returns.tt | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 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 50580d54e8..c1c6062979 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -57,14 +57,14 @@ [% BLOCK all_checkin_messages %] [% IF hold_auto_filled %] -
+
[% IF ( reservenotes ) %]

Notes: [% reservenotes | html %]

[% END %]

Hold filled for:

  • - [% INCLUDE 'patron-title.inc' patron=patron %] + [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 %] - [% patron.category.description | html %]
    • @@ -163,9 +163,7 @@ [% FOREACH rc IN ReturnClaims %] [% SET patron = rc.patron %]
  • - - [% patron.firstname | html %] [% patron.surname | html %] - + [% INCLUDE 'patron-title.inc' hide_patron_infos_if_needed=1 invert_name=1 %]
    • [% END %]
@@ -175,7 +173,7 @@ [% IF ( waiting_holds ) %]
-

[% holdsfirstname | html %] [% holdssurname | html %] has [% waiting_holds | html %] hold(s) waiting for pickup.

+

[% INCLUDE 'patron-title.inc' patron=issue.patron hide_patron_infos_if_needed=1 invert_name=1 %] has [% waiting_holds | html %] hold(s) waiting for pickup.

Check out to this patron.

[% END %] @@ -184,9 +182,7 @@ [% IF return_date_was_overriden && issue.patron.is_debarred %]

- - [% issue.patron.firstname | html %] [% issue.patron.surname | html %] - + [% 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.

@@ -418,7 +414,7 @@

Hold for:

  • - [% 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" %] - [% patron.category.description | html %]
    • [% INCLUDE display_holdpatron_address %] @@ -577,7 +573,7 @@
    Hold for: