Merge pull request #206 from EyeSeeTea/development

Release 0.7.1
EyeSeeTea · Jun 17, 2021 · c4a12ac · c4a12ac
2 parents da9d3d0 + 73d7351
commit c4a12ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-user-extended-app",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "DHIS2 Extended User app",
   "main": "src/index.html",
   "license": "GPL-3.0",

diff --git a/src/models/userList.js b/src/models/userList.js
@@ -48,10 +48,6 @@ export async function getUserList(d2, filtersObject, listOptions) {
     const hasQuery = query !== "" || canManage !== undefined;
     const hasFilters = !_.isEmpty(filters);
 
-    if (!hasFilters) {
-        return getUserListStandard(d2, filtersObject, listOptions);
-    }
-
     const usersByQuery = hasQuery ? await getD2Users(d2, { query, canManage }) : null;
     const usersByFilters = hasFilters ? await getFilteredUsers(d2, filters) : null;
     const allUsers = !hasQuery && !hasFilters ? await getD2Users(d2, {}) : null;