diff --git a/webadmin/views/usercreate.html b/webadmin/views/usercreate.html index 8c7bb5528..1afe610ee 100644 --- a/webadmin/views/usercreate.html +++ b/webadmin/views/usercreate.html @@ -4,29 +4,48 @@

Create User

-
-
- - - -
-
- - - -
-
- - - -
-
- - - -
- - + +
+
+ +
+ A username is required + The username is too short + The username is too long + The username is already taken +
+ +
+
+ +
+ An email is required + This is not a valid email +
+ +
+
+ +
+ A password is required + The password is too short + The password is too long +
+ +
+
+ +
+ Please repeat your password + The password is too short + The password is too long + The passwords don't match +
+ +
+ + +
diff --git a/webadmin/views/usercreate.js b/webadmin/views/usercreate.js index 9c27b44d4..10f653291 100644 --- a/webadmin/views/usercreate.js +++ b/webadmin/views/usercreate.js @@ -9,40 +9,15 @@ function UserCreateController ($scope, $routeParams, Client) { $scope.password = ''; $scope.passwordRepeat = ''; $scope.email = 'xx@xx.xx'; - - $scope.error = {}; + $scope.alreadyTaken = ''; $scope.submit = function () { - $scope.error.username = null; - $scope.error.email = null; - $scope.error.password = null; - $scope.error.passwordRepeat = null; - - if (!$scope.username) { - $scope.error.username = 'Username must not be empty'; - return; - } - - if (!$scope.email) { - $scope.error.email = 'Email must not be empty'; - return; - } - - if (!$scope.password) { - $scope.error.password = 'Password must not be empty'; - return; - } - - if ($scope.password !== $scope.passwordRepeat) { - $scope.error.passwordRepeat = 'Passwords do not match'; - $scope.passwordRepeat = ''; - return; - } + $scope.alreadyTaken = ''; $scope.disabled = true; Client.createUser($scope.username, $scope.password, $scope.email, function (error) { if (error && error.statusCode === 409) { - $scope.error.username = 'Username already taken'; + $scope.alreadyTaken = $scope.username; return console.error('Username already taken'); } if (error) console.error('Unable to create user.', error);