From a1e7ac9e33c28c3c4a75ecc9d6aee8685ca9ac3f Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Tue, 2 Feb 2021 18:02:03 +0100
Subject: [PATCH] Make user list pagination more tolerant
In case the server returns more results than expected by the limit, it
is now still interpreted as there being more results to query.
This situation can happen when there are multiple user backends in
place.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
.../js/vue-settings-apps-users-management.js | Bin 260107 -> 260105 bytes
.../vue-settings-apps-users-management.js.map | Bin 1246822 -> 1246820 bytes
apps/settings/src/store/users.js | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
index 226300b17efa6b99a9ec91867dca9870648f6845..b5df834e6e42805b159b9de74fc16cfef5534944 100644
GIT binary patch
delta 57
zcmeDFz~A|SzoCV(g=q_O>>)<G=@$<(du(5Rh*^V?(QZ4Cqh=yvmSmZ1Y-pL9nr3X8
MWNBz=nw)9^0EE004*&oF
delta 59
zcmeDDz~B9WzoCV(g=q_O>>(yw+v(>IGka`bc8FPn5y;yP<f)m6SQ;58rWhERTO^tr
NBpDc{B&MaL0RW=56qx`3
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
index 92a3c3b59df93c8b6cb87f9403d7ddfad61a1b5f..8a26d3fe45471c41e9391f5c3f051417b32ee472 100644
GIT binary patch
delta 153
zcmaFX<MX7)r=f+hg{g(Pg=Gut?I%2ej*g*~h3-1Oj-IB|>z=W?ZP$Iu>dJ^Bz8xrj
z#6-j_$uim4&@weO&Db=_($La0In|^+Oqvad*@2h?h&h3n3y8Uam<Nb?ftU}7`GHsf
chy}NYNeex!WVG9EIaMf^2}rM)F0?NX0HU8UVgLXD
delta 179
zcmaFT<MXV?r=f+hg{g(Pg=Gut?I%3Jj*j7#h3-1Oj-KYz>z=W?ZP$Iu>dJ^Bz8xrj
z#6-l>$T%^@z{uPp(cB=(z%V5-EhVizOqvad*@2h?h&h3n3y8Uam<Nb?ftU}7`GHsf
zhy}NYNeex!WU{s0ZZTCTmx<ff)>a`WGdHs&CU1J<Eg|9Qns0;*raLSV;@tjwx=>~w
E02Y)w<NyEw
diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
index 41f2f4e4e8d..7877c3f3a52 100644
--- a/apps/settings/src/store/users.js
+++ b/apps/settings/src/store/users.js
@@ -220,7 +220,7 @@ const actions = {
.then((response) => {
if (Object.keys(response.data.ocs.data.users).length > 0) {
context.commit('appendUsers', response.data.ocs.data.users)
- return Object.keys(response.data.ocs.data.users).length === limit
+ return Object.keys(response.data.ocs.data.users).length >= limit
}
return false
})
@@ -237,7 +237,7 @@ const actions = {
.then((response) => {
if (Object.keys(response.data.ocs.data.users).length > 0) {
context.commit('appendUsers', response.data.ocs.data.users)
- return Object.keys(response.data.ocs.data.users).length === limit
+ return Object.keys(response.data.ocs.data.users).length >= limit
}
return false
})
--
GitLab