#1803 Fix the API call that lists the users of an roganisation

TheHive-Project · Mar 4, 2021 · 30bfbeb · 30bfbeb
1 parent ab6f660
commit 30bfbeb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js b/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js
@@ -44,6 +44,7 @@
                     sort: self.filtering.context.sort,
                     loadAll: false,
                     pageSize: self.filtering.context.pageSize,
+                    pageOptions: {organisation: self.org.name},
                     filter: this.filtering.buildQuery(),
                     operations: [{
                             '_name': 'getOrganisation',

diff --git a/frontend/app/scripts/services/common/data/PaginatedQuerySrv.js b/frontend/app/scripts/services/common/data/PaginatedQuerySrv.js
@@ -21,6 +21,7 @@
                 this.scope = options.scope;
                 this.loadAll = !!options.loadAll;
                 this.pageSize = options.pageSize || 10;
+                this.pageOptions = options.pageOptions || {};
                 this.baseFilter = options.baseFilter;
                 this.filter = options.filter;
                 this.sort = options.sort;
@@ -84,10 +85,14 @@
                     var from = to - this.pageSize;
                     //range = start + '-' + end;
 
-                    return _.extend({
-                        from: from,
-                        to: to
-                    }, self.extraData ? {extraData: self.extraData} : {});
+                    return _.extend(
+                        {
+                            from: from,
+                            to: to
+                        },
+                        self.extraData ? {extraData: self.extraData} : {},
+                        self.pageOptions ? self.pageOptions : {}
+                    );
                 };