From: Garry Collum Date: Wed, 8 May 2019 00:57:50 +0000 (-0400) Subject: LP1821969 Patron Prefix and Suffix Display in Summary X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=55b14b6b37f6ad8879917593643876c8639db86b;p=working%2FEvergreen.git LP1821969 Patron Prefix and Suffix Display in Summary Adds support for displaying the patron prefix, suffix, preferred prefix, and preferred suffix in the patron summary sidebar. To test: 1. Add a combination of prefixes, suffixes, preferred prefixes, and preferred suffixes to several patrons. 2. Also add some other preferred information to some of these patrons. 3. In the sidebar notice the lack of prefix information in both the patron's main heading and in the preferred name information. 4. Apply the patch. 5. In the sidebar the prefixes and suffixes are now displayed. Signed-off-by: Garry Collum --- diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2 index 5ebbe0eb9b..93fbab7d85 100644 --- a/Open-ILS/src/templates/staff/circ/patron/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2 @@ -97,10 +97,12 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
- [% l('[_1], [_2] [_3]', + [% l('[_1] [_2], [_3] [_4] [_5]', + '{{patron().prefix()}}', '{{patron().family_name()}}', '{{patron().first_given_name()}}', - '{{patron().second_given_name()}}') %] + '{{patron().second_given_name()}}', + '{{patron().suffix()}}') %]
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 index 7963ca0bb0..1a10b39d43 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 @@ -2,12 +2,14 @@
+ ng-if="patron().pref_prefix() || patron().pref_family_name() || patron().pref_first_given_name() || patron().pref_second_given_name() || patron().pref_suffix()">
- [% l('[_1], [_2] [_3] (Preferred)', + [% l('[_1] [_2], [_3] [_4] [_5] (Preferred)', + '{{patron().pref_prefix() || patron().prefix()}}', '{{patron().pref_family_name() || patron().family_name()}}', '{{patron().pref_first_given_name() || patron().first_given_name()}}', - '{{patron().pref_second_given_name()}}') + '{{patron().pref_second_given_name()}}', + '{{patron().pref_suffix() || patron().suffix()}}') %]