From 9d10d076122c4adb6c14b1b86b3bcca0e33ecc4a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 1 Aug 2018 10:03:42 -0300 Subject: [PATCH] Bug 21137: Replace BORROWER_INFO with logged_in_user it also removes 'category_type' and 'description' from a couple of opac scripts, they are not needed. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../bootstrap/en/includes/patron-title.inc | 13 +++--- .../en/modules/opac-account-pay-error.tt | 2 +- .../bootstrap/en/modules/opac-account.tt | 2 +- .../bootstrap/en/modules/opac-illrequests.tt | 2 +- .../bootstrap/en/modules/opac-issue-note.tt | 2 +- .../opac-memberentry-update-submitted.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-messaging.tt | 2 +- .../bootstrap/en/modules/opac-passwd.tt | 2 +- .../bootstrap/en/modules/opac-privacy.tt | 2 +- .../en/modules/opac-readingrecord.tt | 2 +- .../en/modules/opac-routing-lists.tt | 2 +- .../bootstrap/en/modules/opac-user.tt | 44 +++++++++---------- opac/opac-account.pl | 6 --- opac/opac-messaging.pl | 2 +- opac/opac-routing-lists.pl | 5 --- opac/opac-user.pl | 3 +- 17 files changed, 43 insertions(+), 52 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc index 265125df5b..81a4e72591 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc @@ -1,5 +1,8 @@ -[% IF category_type == 'I' %] - [% surname %] [% IF othernames %] ([% othernames %]) [% END %] -[% ELSE %] - [% firstname %] [% surname %] -[% END %] +[%- IF patron.category.category_type == 'I' -%] + [% patron.surname %][% IF patron.othernames %] ([% patron.othernames %]) [%- END -%] +[%- ELSE -%] + [%- IF patron.title -%] + [% patron.title %] + [%- END -%] + [% patron.firstname %] [% patron.surname %] +[%- END -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt index d4fb5b5ce2..712f7bc251 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt @@ -9,7 +9,7 @@
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt index 2ea86074f2..f381668bc8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -19,7 +19,7 @@
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index 67cc39abe3..2ad7d56c70 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -17,7 +17,7 @@