From 7d4d03d1bef5e14760e0ea639a8edeb796c633a7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 15 Jun 2020 11:14:22 +0000 Subject: [PATCH] Bug 25747: Don't display a comma when patron has no firstname This patch adds a check for the existence of "firstname" to patron-title.inc so that if the patron has no firstname the "invert name" setting doesn't cause an unnecessary comma to appear. To test, apply the patch and locate or create a patron with no first name. - When checking out to the patron, examine the page title. It should say "Checking out to (). - When checking out to a patron with first and last name it should show as before, "Checking out to , ( Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit d2f136713e814d4e33e18d1cdad88f3675a9ec3a) Signed-off-by: Lucas Gass --- koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d5dcd7d0f0..71a293588a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -60,7 +60,7 @@ [%- IF data.category_type == 'I' -%] [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] [%- ELSIF invert_name -%] - [% data.title | $raw %][%- data.surname | html %], [% data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END -%] + [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%] [%- ELSE -%] [% data.title | $raw %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] [%- END -%] -- 2.39.5