From 34f4329f95ae113e201b09802f2701ab5be2b70c Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 19 Sep 2018 11:55:38 -0400
Subject: [PATCH] CAT-172 Additional AngJS patron edit fixes

Avoid setting a hold_notify prefence, since KCLS does not have that
user setting type present in the database.

Minor formatting/layout repairs.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2    | 17 +++++++----------
 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js |  7 ++++++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index f6fbe8d353..1389e40abe 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -179,15 +179,6 @@ within the "form" by name for validation.
   </div>
 </div>
 
-<!-- PREFIX -->
-
-<div class="row reg-field-row" ng-show="show_field('au.prefix')">
-  [% draw_field_label('au', 'prefix') %] [% draw_form_input('au', 'prefix'); %]
-  <div class="col-md-6 patron-reg-example">
-    [% draw_example_text('au', 'prefix') %]
-  </div>
-</div>
-
 <div class="row reg-field-row">
   <div class="col-md-6">
     <ul class="nav nav-pills nav-pills-like-tabs">
@@ -198,6 +189,9 @@ within the "form" by name for validation.
         <a ng-click="name_tab='preferred'">[% l('Preferred Name') %]</a>
       </li>
     </ul>
+  </div>
+</div>
+
 <div ng-show="name_tab == 'primary'">
 
   <!-- PREFIX -->
@@ -227,6 +221,7 @@ within the "form" by name for validation.
     <div class="col-md-6 patron-reg-example">
       [% draw_example_text('au', 'first_given_name') %]
     </div>
+  </div>
 
   <!-- SECOND_GIVEN_NAME -->
 
@@ -500,7 +495,7 @@ within the "form" by name for validation.
 </div>
 <!-- addresses -->
 
-<div class="row">
+<div class="row" style="border-bottom: 1px solid #888; padding-bottom:3px;margin-bottom:3px;">
   <button type="button" ng-click="new_address()" class="btn btn-success">[% l('New Address') %]</button>
 </div>
 
@@ -741,6 +736,7 @@ within the "form" by name for validation.
     </div>
   </div>
 
+  <!-- KCLS does not use.
   <div class="row reg-field-row">
     <div class="col-md-3 reg-field-label">
       <label>[% l('Holds Notices') %]</label>
@@ -757,6 +753,7 @@ within the "form" by name for validation.
       </div>
      </div>
   </div>
+  -->
 
   <div class="row reg-field-row" ng-if="org_settings['sms.enable']">
     <div class="col-md-3 reg-field-label">
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index 35fbfde460..108b086054 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -556,7 +556,7 @@ angular.module('egCoreMod')
         var static_types = [
             'circ.holds_behind_desk', 
             'circ.collections.exempt', 
-            'opac.hold_notify', 
+            'opac.hold_notify',  // KCLS does not use this, harmless here.
             'opac.default_phone', 
             'opac.default_pickup_location', 
             'opac.default_sms_carrier', 
@@ -1730,6 +1730,11 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
     // Translate hold notify preferences from the form/scope back into a 
     // single user setting value for opac.hold_notify.
     function compress_hold_notify() {
+        // KCLS does not use opac.hold_notify nor is the setting
+        // present in the database.  This code is not friendly
+        // to that scenario.  Exit early;
+        return;
+
         var hold_notify_methods = [];
         if ($scope.hold_notify_type.phone) {
             hold_notify_methods.push('phone');
-- 
2.11.0