From d97268dfa77d3f982bc31ff64d1e1eeec8255dad Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@nebulon.de>
Date: Thu, 25 Jan 2018 18:28:11 +0100
Subject: [PATCH] Give some busy indicator while email configs are fetching

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

diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 897581b66..f200e4aee 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -118,13 +118,14 @@
                         </div>
                         <div ng-show="groups.length <= 1">No groups available.</div>
                     </div>
-                    <div class="form-group">
-                        <label class="control-label">Email Address on Domains</label>
+                    <h2 ng-show="useredit.busyFetching"><center><i class="fa fa-circle-o-notch fa-spin"></i></center></h2>
+                    <div ng-hide="useredit.busyFetching" class="form-group">
+                        <label class="control-label">Email address on domains</label>
                         <div>
                             <multiselect ng-model="useredit.emailAddresses" options="a for a in useredit.availableEmailAddresses" data-multiple="true"></multiselect>
                         </div>
                     </div>
-                    <div class="form-group" ng-show="useredit.userInfo.username" ng-class="{ 'has-error': useredit.error.aliases }">
+                    <div class="form-group" ng-show="!useredit.busyFetching && useredit.userInfo.username" ng-class="{ 'has-error': useredit.error.aliases }">
                         <label class="control-label">Email aliases</label>
 
                         <div class="control-label" ng-show="useredit.error.aliases">
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 0119189cb..3a0ff09a3 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -162,6 +162,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     $scope.useredit = {
         busy: false,
+        busyFetching: false,
         error: {},
         userInfo: {},
         email: '',
@@ -172,6 +173,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         superuser: false,
 
         show: function (userInfo) {
+            $scope.useredit.busyFetching = true;
             $scope.useredit.error = {};
             $scope.useredit.email = userInfo.email;
             $scope.useredit.fallbackEmail = userInfo.fallbackEmail;
@@ -200,7 +202,11 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                         callback();
                     });
                 });
-            }, function () {
+            }, function (error) {
+                $scope.useredit.busyFetching = false;
+
+                if (error) return console.error(error);
+
                 // we need this copy as angular multiselect cannot deal with dynamic arrays!
                 $scope.useredit.emailAddresses = tmp;
             });