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

Distinguish between username and email conflict

Browse Source
This commit is contained in:
Johannes Zellner
2016-06-02 15:19:35 +02:00
parent 8eeee712aa
commit a52e2ffc23
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,10 +189,20 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.busy = false;
if (error && error.statusCode === 409) {
$scope.useradd.error.email = 'Email already taken';
$scope.useradd_form.email.$setPristine();
$('#inputUserAddEmail').focus();
return;
if (error.message.toLowerCase().indexOf('email') !== -1) {
$scope.useradd.error.email = 'Email already taken';
$scope.useradd_form.email.$setPristine();
$('#inputUserAddEmail').focus();
return;
} else if (error.message.toLowerCase().indexOf('username') !== -1) {
$scope.useradd.error.username = 'Username already taken';
$scope.useradd_form.username.$setPristine();
$('#inputUserAddUsername').focus();
} else {
// should not happen!!
console.error(error.message);
return;
}
}
if (error && error.statusCode === 400) {
if (error.message.indexOf('email') !== -1) {