From 30bfbebcea5d15b82d498aa22c72149ae64800ed Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Thu, 4 Mar 2021 11:28:25 +0100
Subject: [PATCH] #1803 Fix the API call that lists the users of an
 roganisation

---
 .../admin/organisation/OrgDetailsCtrl.js            |  1 +
 .../services/common/data/PaginatedQuerySrv.js       | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js b/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js
index c342f8504c..ef29e8e7cb 100644
--- 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
index 29f077b1e7..25cce42f48 100644
--- 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 : {}
+                    );
                 };