From 3c1598dc5a06f1dda9259ba73258d98811f3d538 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 12 Apr 2018 16:58:40 +0200 Subject: [PATCH] #94 All orgadmin to update users and display error message in case of failure --- .../admin/common/user-dialog/user.edit.controller.js | 10 +++++++++- .../admin/common/user-list/users-list.controller.js | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/www/src/app/pages/admin/common/user-dialog/user.edit.controller.js b/www/src/app/pages/admin/common/user-dialog/user.edit.controller.js index bc5617a86..ad3d19eb4 100644 --- a/www/src/app/pages/admin/common/user-dialog/user.edit.controller.js +++ b/www/src/app/pages/admin/common/user-dialog/user.edit.controller.js @@ -99,9 +99,17 @@ export default class UserEditController { return; } - let postData = _.pick(this.formData, 'name', 'roles', 'organization'); + let postData; let promise; + if ( + this.AuthService.currentUser.roles.indexOf(this.Roles.SUPERADMIN) !== -1 + ) { + postData = _.pick(this.formData, 'name', 'roles', 'organization'); + } else { + postData = _.pick(this.formData, 'name', 'roles'); + } + if (this.user.id) { promise = this.UserService.update(this.user.id, postData); } else { diff --git a/www/src/app/pages/admin/common/user-list/users-list.controller.js b/www/src/app/pages/admin/common/user-list/users-list.controller.js index 48fe6ff58..d9f233fde 100644 --- a/www/src/app/pages/admin/common/user-list/users-list.controller.js +++ b/www/src/app/pages/admin/common/user-list/users-list.controller.js @@ -137,9 +137,9 @@ export default class UsersListController { `User ${mode === 'edit' ? 'updated' : 'created'} successfully` ); }) - .catch(rejection => { - if (rejection && rejection.type === 'ConflictError') { - // Handle user uniquness + .catch(err => { + if (!_.isString(err)) { + this.NotificationService.error('Unable to update the user.'); } }); }