[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. bdaa9e58432a8794e38b59f52ffad70cf45567c6

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_3 has been updated
       via  bdaa9e58432a8794e38b59f52ffad70cf45567c6 (commit)
       via  10ef5770fd7a76a4637f2bf5bb90273720f3e862 (commit)
      from  8596a3d80ef83b5b5f89ca741ecea4d5e4e1232e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bdaa9e58432a8794e38b59f52ffad70cf45567c6
Author: Michele Morgan <mmorgan at noblenet.org>
Date:   Mon Sep 16 14:50:16 2019 -0400

    LP1821969 Additional fix to second_given_name
    
    Adds primary second_given_name to the preferred name if there is no
    preferred second_given_name. This matches the behavior of the other name
    fields.
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 a0de76c0d8..11df48de6e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -8,7 +8,7 @@
           '{{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().second_given_name()}}',
           '{{patron().pref_suffix() || patron().suffix()}}')
         %]
       </div>

commit 10ef5770fd7a76a4637f2bf5bb90273720f3e862
Author: Garry Collum <gcollum at gmail.com>
Date:   Tue May 7 20:57:50 2019 -0400

    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 <gcollum at gmail.com>
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index 259dae7019..6c0e794a8e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -98,10 +98,12 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
         <div class="flex-row">
           <div class="flex-cell"
           ng-class="{'patron-summary-alert' : hasAlerts()}">
-            [% 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()}}') %]
                <span ng-if="patron().name_keywords()"> <a title="[% l('Name keywords: ') %]{{patron().name_keywords()}}" class="glyphicon glyphicon-tags"></a>
           </div>
 
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 d5c18ea5ac..a0de76c0d8 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 @@
 <div ng-cloak class="patron-summary-grid-wrapper">
   <div ng-show="patron()" id="patron-summary-grid">
     <div class="row patron-summary-pref-name"
-      ng-if="patron().pref_family_name() || patron().pref_first_given_name() || patron().pref_second_given_name()">
+      ng-if="patron().pref_prefix() || patron().pref_family_name() || patron().pref_first_given_name() || patron().pref_second_given_name() || patron().pref_suffix()">
       <div class="col-md-12">
-        [% 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()}}')
         %]
       </div>
     </div>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/circ/patron/index.tt2     | 6 ++++--
 Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS