Skip to content

Commit 62cd1ee

Browse files
committed
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>
1 parent 392dc8b commit 62cd1ee

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

apps/settings/js/vue-settings-apps-users-management.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/src/store/users.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ const actions = {
220220
.then((response) => {
221221
if (Object.keys(response.data.ocs.data.users).length > 0) {
222222
context.commit('appendUsers', response.data.ocs.data.users)
223-
return Object.keys(response.data.ocs.data.users).length === limit
223+
return Object.keys(response.data.ocs.data.users).length >= limit
224224
}
225225
return false
226226
})
@@ -237,7 +237,7 @@ const actions = {
237237
.then((response) => {
238238
if (Object.keys(response.data.ocs.data.users).length > 0) {
239239
context.commit('appendUsers', response.data.ocs.data.users)
240-
return Object.keys(response.data.ocs.data.users).length === limit
240+
return Object.keys(response.data.ocs.data.users).length >= limit
241241
}
242242
return false
243243
})

0 commit comments

Comments
 (0)