From 6d17f80fa20b3ba763e293bec490979dec3fd9ea Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Wed, 28 Nov 2018 22:10:24 +0000
Subject: [PATCH] lp1777677 Show test notification buttons by retrieved data

- Prevents test notification buttons from displaying when email or sms
data is input but no data exists on server.

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>

 Changes to be committed:
	modified:   Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
	modified:   Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2    | 4 ++--
 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js | 2 ++
 2 files changed, 4 insertions(+), 2 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 89b4f4a627..b16d876744 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -459,7 +459,7 @@ within the "form" by name for validation.
 <div class="row reg-field-row" ng-show="show_field('au.email')">
   [% draw_field_label('au', 'email') %]
   [% draw_form_input('au', 'email', '', 'email') %]
-  <div class="col-md-3" ng-if="patron.email && !patron.isnew">
+  <div class="col-md-3" ng-if="base_email && !patron.isnew">
     <button class="btn btn-default" ng-click="send_test_message({test_type:'email'})">[% l('Send Test Email') %]</button>
   </div>
   <div class="col-md-3 patron-reg-example">
@@ -788,7 +788,7 @@ within the "form" by name for validation.
       ng-change="field_modified()" ng-model="user_settings['opac.default_sms_notify']"
       type='text'/>
   </div>
-  <div class="col-md-3" ng-if="user_settings['opac.default_sms_notify'] && !patron.isnew">
+  <div class="col-md-3" ng-if="base_default_sms && !patron.isnew">
     <button class="btn btn-default" ng-click="send_test_message({test_type:'sms_text'})">[% l('Send Test Text') %]</button>
   </div>
 </div>
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 f3aa401428..7c4db9de5e 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
@@ -1360,6 +1360,8 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
         // in standalone mode, we have no patronSvc
         var prs = patronRegSvc;
         $scope.patron = patron;
+        $scope.base_email = patron.email;
+        $scope.base_default_sms = prs.user_settings['opac.default_sms_notify']
         $scope.field_doc = prs.field_doc;
         $scope.edit_profiles = prs.edit_profiles;
         $scope.edit_profile_entries = prs.edit_profile_entries;
-- 
2.11.0