#94 All orgadmin to update users and display error message in case of…

… failure
TheHive-Project · Apr 12, 2018 · 3c1598d · 3c1598d
1 parent 0efa3d8
commit 3c1598d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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
@@ -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.');
         }
       });
   }