From 6c10d685a7c464e2e483d9f1818d820abb421d89 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Fri, 27 Jul 2012 16:32:49 +0100 Subject: [PATCH] Bug 8514 Restore Patron Name Display Order Bug 6303 introduced an include file governing patron name display unfortunately that changed patron display in search result lists and on the circ screen header. This adds a parameter restroring the original surname, firstname order, whose absence was perceived as a loss of functionality Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain --- koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc index d07a4492e7..c05c9be0e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -1,6 +1,10 @@ [% IF category_type == 'I' %] [% surname %] [% IF othernames %] ([% othernames %]) [% END %] [% ELSE %] - [% firstname %] [% surname %] + [% IF invert_name %] + [% surname %], [% firstname %] + [% ELSE %] + [% firstname %] [% surname %] + [% END %] [% END %] ([% cardnumber %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index ea08f1454e..8724e9dc58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1,6 +1,10 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation [% IF ( borrowernumber ) %] › Checking out to [% INCLUDE 'patron-title.inc' %] [% END %] +Koha › Circulation +[% IF borrowernumber %] + › Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 %] +[% END %] + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] [% IF ( UseTablesortForCirc ) %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index e226c0429f..7060cbf122 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -60,8 +60,10 @@ [% END %] [% END %] [% resultsloo.cardnumber %] - - [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber %]
+ + + [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber invert_name = 1%] +
[% IF ( resultsloo.streetnumber ) %][% resultsloo.streetnumber %] [% END %][% resultsloo.address %][% IF ( resultsloo.address2 ) %]
[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]
[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %] [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %] [% resultsloo.category_description %] ([% resultsloo.category_type %]) [% resultsloo.branchcode %] -- 2.20.1