From 2fac9e28b300c48e7f8008128f7593be167d5cc8 Mon Sep 17 00:00:00 2001
From: Scott Angel <scottangel@mobiusconsortium.org>
Date: Tue, 21 Mar 2023 10:42:48 -0500
Subject: [PATCH] LP1797025 Allow patrons to add/edit their preferred name

Fixed issues pertaining to the previous commits. Listed on #12 of the launchpad bug.
1a - if a Preferred name is set, the field displays twice. This has been
fixed and now displays only 1 set of preferred names.
2 - "Update Username" now displays "Update Preferred Name"
3 - Removed the display of preferred names on the form as it was a bit
  redundant.

Signed-off-by: Scott Angel <scottangel@mobiusconsortium.org>
---
 .../src/templates-bootstrap/opac/myopac/prefs.tt2  | 23 ++++------------------
 .../opac/myopac/update_preferred_name.tt2          |  9 ++-------
 .../opac/myopac/update_preferred_name.tt2          |  5 -----
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
index 43ae634a36..61b99d99cc 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
@@ -16,32 +16,17 @@
                 <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_first_given_name,
                         ctx.user.pref_second_given_name,
-                        (ctx.user.pref_family_name || ctx.user.family_name),
+                        ctx.user.pref_family_name,
                         ctx.user.pref_suffix
                         ) | html %]</td>
 
                 <td class='light_border'><a class="btn btn-sm btn-action" href='update_preferred_name'
-                    title="[% l('Change Preferred Name') %]"><i class="fas fa-user-cog"></i>[% l("Change") %]</a></td>
-
-            </tr>
-            [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %]
-            <tr>
-                <td 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.pref_family_name || ctx.user.family_name),
-                    ctx.user.pref_suffix
-                ) | html %]</td>
+                    title="[% l('Change Preferred Name') %]"><i class="fas fa-user-cog"></i>[% l("Change") %]</a>
+                </td>
 
-                <td></td>
             </tr>
-            [%  END %]
             <tr>
                 <td class='color_4 light_border'>[% l("Legal Name") %]</td>
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/update_preferred_name.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/update_preferred_name.tt2
index 8c464f43c7..cbdaa07a69 100644
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/update_preferred_name.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/update_preferred_name.tt2
@@ -2,11 +2,11 @@
     PROCESS "opac/parts/misc_util.tt2";
     WRAPPER "opac/parts/myopac/base.tt2";
     myopac_page = "prefs"  %]
-<h3 class="sr-only">[% l('Update Username') %]</h3>
+<h3 class="sr-only">[% l('Update Preferred Name') %]</h3>
 <div id='myopac_summary_div' style="padding:0px;">
 
     <div class="header_middle">
-        <span class="float-left">[% l('Update Username') %]</span>
+        <span class="float-left">[% l('Update Preferred Name') %]</span>
     </div>
 
 [% IF ctx.password_incorrect %]
@@ -18,11 +18,6 @@
 
 <form method='post' id='account-update-preferred-name' autocomplete='off'>
     <table>
-        <tr><td>[% l('Current Prefix') %]</td><td> [% ctx.user.pref_prefix | html %]</td></tr>
-        <tr><td>[% l('Current First Name') %]</td><td> [% ctx.user.pref_first_given_name | html %]</td></tr>
-        <tr><td>[% l('Current Second Name') %]</td><td> [% ctx.user.pref_second_given_name | html %]</td></tr>
-        <tr><td>[% l('Current Family Name') %]</td><td> [% ctx.user.pref_family_name | html %]</td></tr>
-        <tr><td>[% l('Current Suffix') %]</td><td> [% ctx.user.pref_suffix | html %]</td></tr>
         <tr><td><label for="current_pw">[% l('Current Password') %]</label></td><td><input type='password' name='current_pw' id='current_pw' class="form-control" /></td></tr>
         <tr><td><label for='pref-prefix'>[% l('New Preferred Prefix') %]</label></td><td><input type='text' name='pref_prefix' id='pref_prefix' class="form-control" /></td></tr>
         <tr><td><label for='pref-first-given-name'>[% l('New Preferred First Name') %]</label></td><td><input type='text' name='pref_first_given_name' id='pref_first_given_name' class="form-control" /></td></tr>
diff --git a/Open-ILS/src/templates/opac/myopac/update_preferred_name.tt2 b/Open-ILS/src/templates/opac/myopac/update_preferred_name.tt2
index b519c01288..8ec59af40b 100644
--- a/Open-ILS/src/templates/opac/myopac/update_preferred_name.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_preferred_name.tt2
@@ -19,11 +19,6 @@
 
 <form method='post' id='account-update-preferred-name' autocomplete='off'>
    <table>
-       <tr><td>[% l('Current Prefix') %]</td><td> [% ctx.user.pref_prefix | html %]</td></tr>
-       <tr><td>[% l('Current First Name') %]</td><td> [% ctx.user.pref_first_given_name | html %]</td></tr>
-       <tr><td>[% l('Current Second Name') %]</td><td> [% ctx.user.pref_second_given_name | html %]</td></tr>
-       <tr><td>[% l('Current Family Name') %]</td><td> [% ctx.user.pref_family_name | html %]</td></tr>
-       <tr><td>[% l('Current Suffix') %]</td><td> [% ctx.user.pref_suffix | html %]</td></tr>
        <tr><td><label for="current_pw">[% l('Current Password') %]</label></td><td><input type='password' name='current_pw' id='current_pw' /></td></tr>
        <tr><td><label for='pref-prefix'>[% l('New Preferred Prefix') %]</label></td><td><input type='text' name='pref_prefix' id='pref_prefix' /></td></tr>
        <tr><td><label for='pref-first-given-name'>[% l('New Preferred First Name') %]</label></td><td><input type='text' name='pref_first_given_name' id='pref_first_given_name' /></td></tr>
-- 
2.11.0