diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js index 91265366a..08a9edda0 100644 --- a/webadmin/src/js/client.js +++ b/webadmin/src/js/client.js @@ -541,10 +541,11 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification', }).error(defaultErrorHandler(callback)); }; - Client.prototype.createUser = function (username, email, sendInvite, callback) { + Client.prototype.createUser = function (username, email, displayName, sendInvite, callback) { var data = { username: username, email: email, + displayName: displayName, invite: !!sendInvite }; diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html index 018c20e9b..d1bb13dbe 100644 --- a/webadmin/src/views/users.html +++ b/webadmin/src/views/users.html @@ -28,6 +28,17 @@ + +
+ +
+ A Name is required + This is not a valid Name + {{ useradd.error.displayName }} +
+ +
+
- \ No newline at end of file + diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js index f991d89cd..07c3631ec 100644 --- a/webadmin/src/views/users.js +++ b/webadmin/src/views/users.js @@ -21,6 +21,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio error: {}, username: '', email: '', + displayName: '', sendInvite: true }; @@ -54,14 +55,16 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $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.sendInvite, function (error) { + Client.createUser($scope.useradd.username, $scope.useradd.email, $scope.useradd.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_form.username.$setPristine(); $scope.useradd_form.email.$setPristine(); + $scope.useradd_form.displayName.$setPristine(); $('#inputUserAddUsername').focus(); return; } @@ -76,6 +79,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $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); } @@ -86,6 +95,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.useradd.error = {}; $scope.useradd.username = ''; $scope.useradd.email = ''; + $scope.useradd.displayName = ''; $scope.useradd_form.$setUntouched(); $scope.useradd_form.$setPristine();