#1327 Update UserSrv for a better configuration

TheHive-Project · May 22, 2020 · 55a53c5 · 55a53c5
1 parent 3cf0d97
commit 55a53c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
@@ -178,9 +178,9 @@
                                 return UserSrv.list(
                                     self.currentUser.organisation,
                                     {
-                                        filter: {_is: { locked: false }},
+                                        filter: { locked: false },
                                         sort: [{'name': 'asc'}]
-                                    }                                    
+                                    }
                                 );
                             },
                             groups: function() {

diff --git a/frontend/app/scripts/directives/updatableUser.js b/frontend/app/scripts/directives/updatableUser.js
@@ -18,7 +18,7 @@
 
                         if(value === true && !cached) {
                             UserSrv.list(AuthenticationSrv.currentUser.organisation, {
-                                filter: {_is: { locked: false }},
+                                filter: { locked: false },
                                 sort: [{'name': 'asc'}]
                             })
                                 .then(function(users) {

diff --git a/frontend/app/scripts/services/api/UserSrv.js b/frontend/app/scripts/services/api/UserSrv.js
@@ -184,13 +184,15 @@
                     }
                 ];
 
+                // Apply filter is defined
                 if (options && options.filter) {
-                    options.filter._name = 'filter';
-
-                    operations.push(options.filter);
+                    operations.push({
+                        '_name': 'filter',
+                        '_is': options.filter
+                    });
                 }
 
-                // Sort users by name
+                // Apply sort is defined
                 if (options && options.sort) {
                     operations.push({
                         '_name': 'sort',