Bug 13632: QA follow-up: Tidy installer directories / update permissions.inc

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / patron-title.inc

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 c05c9be..dbcab25 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
@@ -1,10 +1,27 @@
-[% IF category_type == 'I' %]
-    [% surname %] [% IF othernames %] ([% othernames %]) [% END %]
-[% ELSE %]
-    [% IF invert_name %]
-        [% surname %], [% firstname %]
-    [% ELSE %]
-        [% firstname %] [% surname %]
-    [% END %]
-[% END %]
-([% cardnumber %])
+[%- IF ( borrower.borrowernumber ) %]
+    [%- IF borrower.category_type == 'I' %]
+        [%- borrower.surname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %]
+    [%- ELSE %]
+        [%- IF invert_name %]
+            [%- borrower.surname %], [% borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %]
+        [%- ELSE %]
+            [%- borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %]
+        [%- END -%]
+    [%- END -%]
+    [%- IF ( borrower.cardnumber ) -%]
+        ([% borrower.cardnumber %])
+    [%- END %]
+[%- ELSIF ( borrowernumber ) %]
+    [%- IF category_type == 'I' %]
+        [%- surname %] [% IF othernames %] ([% othernames %]) [% END %]
+    [%- ELSE %]
+        [%- IF invert_name %]
+            [%- surname %], [% firstname %] [% IF othernames %] ([% othernames %]) [% END %]
+        [%- ELSE %]
+            [%- firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %]
+        [%- END %]
+    [%- END -%]
+    [%- IF ( cardnumber ) -%]
+        ([% cardnumber %])
+    [%- END %]
+[%- END -%]