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

display alias errors

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-09-28 12:52:42 -07:00
parent 10ff0f559c
commit 61292c4df9
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,11 +122,15 @@
</div>
<div ng-show="groups.length <= 1">No groups available.</div>
</div>
<div class="form-group" ng-show="useredit.userInfo.username && mailConfig.enabled">
<div class="form-group" ng-show="useredit.userInfo.username && mailConfig.enabled" ng-class="{ 'has-error': useredit.error.aliases }">
<label class="control-label">Email aliases</label>
<div class="control-label" ng-show="useredit.error.aliases">
<small>{{ useredit.error.aliases }}</small>
</div>
<div class="input-group form-inline">
<tag-input class="form-group form-control" placeholder='Separate aliases by comma' taglist='useredit.aliases'></tag-input>
<tag-input class="form-group form-control" placeholder='Separate aliases by comma' taglist='useredit.aliases' name="aliases"></tag-input>
<div class="input-group-addon">
@{{ config.fqdn }}
</div>

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

@@ -158,7 +158,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
superuser: false,
show: function (userInfo) {
$scope.useredit.error.email = null;
$scope.useredit.error = {};
$scope.useredit.email = userInfo.alternateEmail || userInfo.email;
$scope.useredit.userInfo = userInfo;
$scope.useredit.groupIds = angular.copy(userInfo.groupIds);
@@ -188,7 +188,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
},
submit: function () {
$scope.useredit.error.email = null;
$scope.useredit.error = {};
$scope.useredit.busy = true;
var data = {
@@ -229,7 +229,16 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
setAliasesFunc(function (error) {
$scope.useredit.busy = false;
if (error) return console.error('Unable to update aliases for user:', error);
if (error) {
if (error.statusCode === 400) {
$scope.useredit.error.aliases = 'One or more aliases is invalid';
} else if (error.statusCode === 409) {
$scope.useredit.error.aliases = 'One or more aliases already taken';
} else {
console.error('Unable to update aliases for user:', error);
}
return;
}
$scope.useredit.userInfo = {};
$scope.useredit.email = '';