From 11cfa2efaa5bb7d2b3ba315013fb62aab4c1f7d9 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@nebulon.de>
Date: Wed, 28 Sep 2016 12:12:37 +0200
Subject: [PATCH] Fix user edit with alternateEmail

---
 webadmin/src/views/account.html | 2 +-
 webadmin/src/views/users.html   | 7 ++++++-
 webadmin/src/views/users.js     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index f4cded0c1..fe2fbd138 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -127,7 +127,7 @@
                         <td class="text-muted" style="vertical-align: top;">Email</td>
                         <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ user.email }} <a href="" ng-click="emailchange.show()" ng-show="!user.alternateEmail"><i class="fa fa-pencil text-small"></i></a></td>
                     </tr>
-                    <tr ng-show="user.alternateEmail" uib-tooltip="Email used for password reset" tooltip-placement="left">
+                    <tr ng-show="user.alternateEmail" uib-tooltip="Email used for password recovery" tooltip-placement="left">
                         <td class="text-muted" style="vertical-align: top;">Alternate Email</td>
                         <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ user.alternateEmail }} <a href="" ng-click="emailchange.show()"><i class="fa fa-pencil text-small"></i></a></td>
                     </tr>
diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 0e9b9f878..9ff986202 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -99,8 +99,13 @@
             <div class="modal-body">
                 <form name="useredit_form" role="form" ng-submit="doUserEdit()" autocomplete="off">
                     <input type="password" style="display: none;">
-                    <div class="form-group" ng-class="{ 'has-error': (useredit_form.email.$dirty && useredit_form.email.$invalid) || (!useredit_form.email.$dirty && useredit.error.email) }">
+                    <div class="form-group" ng-show="useredit.userInfo.alternateEmail">
                         <label class="control-label">Email</label>
+                        <input type="email" class="form-control" ng-model="useredit.userInfo.email" disabled>
+                    </div>
+                    <div class="form-group" ng-class="{ 'has-error': (useredit_form.email.$dirty && useredit_form.email.$invalid) || (!useredit_form.email.$dirty && useredit.error.email) }">
+                        <label class="control-label" ng-show="useredit.userInfo.alternateEmail" uib-tooltip="Email used for password recovery">Alternate Email</label>
+                        <label class="control-label" ng-hide="useredit.userInfo.alternateEmail">Email</label>
                         <div class="control-label" ng-show="(!useredit_form.email.$dirty && useredit.error.email) || (useredit_form.email.$dirty && useredit_form.email.$invalid) || (!useredit_form.email.$dirty && useredit.error.email)">
                             <small ng-show="useredit_form.email.$error.required">An email is required</small>
                             <small ng-show="useredit_form.email.$error.email">This is not a valid email</small>
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index ea34cb023..50ca41d5a 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -236,7 +236,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     $scope.showUserEdit = function (userInfo) {
         $scope.useredit.error.email = null;
-        $scope.useredit.email = userInfo.email;
+        $scope.useredit.email = userInfo.alternateEmail || userInfo.email;
         $scope.useredit.userInfo = userInfo;
         $scope.useredit.groupIds = angular.copy(userInfo.groupIds);
         $scope.useredit.superuser = userInfo.groupIds.indexOf('admin') !== -1;