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

Fixup some bugs in the user handling ui

Browse Source
This commit is contained in:
Johannes Zellner
2016-04-05 10:11:04 +02:00
parent 4939f526d5
commit bb25279878
2 changed files with 3 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,28 +17,7 @@
</div>
<input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required autofocus>
</div>
<!--
<div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username) }">
<label class="control-label">Username (optional)</label>
<div class="control-label" ng-show="(!useradd_form.username.$dirty && useradd.error.username) || (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username)">
<small ng-show="useradd_form.username.$error.required">A username is required</small>
<small ng-show="useradd_form.username.$error.minlength">The username is too short</small>
<small ng-show="useradd_form.username.$error.maxlength">The username is too long</small>
<small ng-show="!useradd_form.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
</div>
<input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" ng-maxlength="512" ng-minlength="3">
</div>
<div class="form-group" ng-class="{ 'has-error': (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName) }">
<label class="control-label">Display Name (optional)</label>
<div class="control-label" ng-show="(!useradd_form.displayName.$dirty && useradd.error.displayName) || (useradd_form.displayname.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName)">
<small ng-show="useradd_form.displayName.$error.required">A Name is required</small>
<small ng-show="useradd_form.displayName.$error.displayName">This is not a valid Name</small>
<small ng-show="!useradd_form.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
</div>
<input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName">
</div>
-->
<div class="checkbox">
<label>
<input type="checkbox" ng-model="useradd.sendInvite" id="inputUserAddSendInvite"> Send invite

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

@@ -20,9 +20,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
busy: false,
alreadyTaken: false,
error: {},
username: '',
email: '',
displayName: '',
sendInvite: true
};
@@ -164,9 +162,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.showUserAdd = function () {
$scope.useradd.error = {};
$scope.useradd.username = '';
$scope.useradd.email = '';
$scope.useradd.displayName = '';
$scope.useradd_form.$setUntouched();
$scope.useradd_form.$setPristine();
@@ -178,20 +174,15 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.busy = true;
$scope.useradd.alreadyTaken = false;
$scope.useradd.error.username = null;
$scope.useradd.error.email = null;
$scope.useradd.error.displayName = null;
Client.createUser($scope.useradd.username, $scope.useradd.email, $scope.useradd.displayName, $scope.useradd.sendInvite, function (error) {
Client.createUser('' /* username */, $scope.useradd.email, '' /* displayName */, $scope.useradd.sendInvite, function (error) {
$scope.useradd.busy = false;
if (error && error.statusCode === 409) {
$scope.useradd.error.username = 'Username or Email already taken';
$scope.useradd.error.email = 'Username or Email already taken';
$scope.useradd_form.username.$setPristine();
$scope.useradd.error.email = 'Email already taken';
$scope.useradd_form.email.$setPristine();
$scope.useradd_form.displayName.$setPristine();
$('#inputUserAddUsername').focus();
$('#inputUserAddEmail').focus();
return;
}
if (error && error.statusCode === 400) {
@@ -200,17 +191,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.error.emailAttempted = $scope.useradd.email;
$scope.useradd_form.email.$setPristine();
$('#inputUserAddEmail').focus();
} else if (error.message.indexOf('username') !== -1) {
$scope.useradd.error.username = 'Invalid Username';
$scope.useradd.error.usernameAttempted = $scope.useradd.username;
$scope.useradd_form.username.$setPristine();
$('#inputUserAddUsername').focus();
} else if (error.message.indexOf('displayName') !== -1) {
$scope.useradd.error.displayName = 'Invalid Name';
$scope.useradd.error.displayNameAttempted = $scope.useradd.displayName;
$scope.useradd_form.displayName.$setPristine();
$('#inputUserAddDisplayName').focus();
} else {
console.error('Unable to create user.', error.statusCode, error.message);
}
@@ -219,9 +199,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
if (error) return console.error('Unable to create user.', error.statusCode, error.message);
$scope.useradd.error = {};
$scope.useradd.username = '';
$scope.useradd.email = '';
$scope.useradd.displayName = '';
$scope.useradd_form.$setUntouched();
$scope.useradd_form.$setPristine();