jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Give some busy indicator while email configs are fetching

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-25 18:28:11 +01:00
parent c3ce6ef9f0
commit d97268dfa7
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webadmin/src/views/users.html
View File

@@ -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">

8
webadmin/src/views/users.js
View File

@@ -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;
});