[open-ils-commits] [GIT] Evergreen ILS branch master updated. 664d4cde5a21191a88f05dd1751f45fb61703efb

[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, master has been updated
       via  664d4cde5a21191a88f05dd1751f45fb61703efb (commit)
       via  86f732b4eade6a22b66979cb8258168ebbf1cbb2 (commit)
      from  af72b32e28e1bca2ca22d0b23050c0874d4e7eb4 (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 664d4cde5a21191a88f05dd1751f45fb61703efb
Author: Bill Erickson <berickxx at gmail.com>
Date:   Sun Sep 16 19:28:11 2018 -0400

    LP#1792482 My OPAC settings preferred name field
    
    Adds a new row to the patron account preferences page for Preferred
    Name.  The field only displays when a preferred first, middle, or last
    value is present and follows the same display logic as preferred names
    in the staff client, where first and last fall-through to the primary
    name.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index f3b80db..4608f1e 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -15,15 +15,32 @@
 
                 <td class='light_border'>[% l(
                     HUMAN_NAME_FORMAT,
-                    (ctx.user.pref_prefix || ctx.user.prefix), 
+                    ctx.user.prefix, 
+                    ctx.user.first_given_name,
+                    ctx.user.second_given_name, 
+                    ctx.user.family_name,
+                    ctx.user.suffix
+                ) | html %]</td>
+
+                <td></td>
+            </tr>
+            [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %]
+            <tr>
+                <td width='30%'
+                    class='color_4 light_border'>[% l("Preferred Name") %]</td>
+
+                <td class='light_border'>[% l(
+                    HUMAN_NAME_FORMAT,
+                    ctx.user.pref_prefix, 
                     (ctx.user.pref_first_given_name || ctx.user.first_given_name),
-                    (ctx.user.pref_second_given_name || ctx.user.second_given_name), 
+                    ctx.user.pref_second_given_name, 
                     (ctx.user.pref_family_name || ctx.user.family_name),
-                    (ctx.user.pref_suffix || ctx.user.suffix)
+                    ctx.user.pref_suffix
                 ) | html %]</td>
 
                 <td></td>
             </tr>
+            [%  END %]
 
             <tr>
                 <td class='color_4 light_border'>[% l("Day Phone") %]</td>

commit 86f732b4eade6a22b66979cb8258168ebbf1cbb2
Author: Bill Erickson <berickxx at gmail.com>
Date:   Sun Sep 16 19:25:44 2018 -0400

    LP#1792482 Only require first/last in pref name display
    
    When displaying a patrons preferred name, always show a value for first
    and last name, starting with the preferred name and defaulting to the
    primary name, but only show values for prefix, middle name, and suffix
    when a preferred variant is applied.
    
    This avoids scenarios where patrons use their middle name as their first
    name, with no preferred middle name applied, resulting duplicate
    first/middle names displaying.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.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 c50ff0d..c89a007 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -7,7 +7,7 @@
         [% l('[_1], [_2] [_3] (Preferred)', 
           '{{patron().pref_family_name() || patron().family_name()}}',
           '{{patron().pref_first_given_name() || patron().first_given_name()}}',
-          '{{patron().pref_second_given_name() || patron().second_given_name()}}') 
+          '{{patron().pref_second_given_name()}}') 
         %]
       </div>
     </div>

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

Summary of changes:
 Open-ILS/src/templates/opac/myopac/prefs.tt2       |   23 +++++++++++++++++--
 .../src/templates/staff/circ/patron/t_summary.tt2  |    2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS