mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Vincent Petry 2021-02-02 18:02:03 +01:00
parent e4bfbfe177
commit ccaa593a44
No known key found for this signature in database
GPG Key ID: E055D6A4D513575C
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/settings/js/vue-settings-apps-users-management.js
View File

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-apps-users-management.js.map
View File

File diff suppressed because one or more lines are too long

4
apps/settings/src/store/users.js
View File

@ -220,7 +220,7 @@ const actions = {
.then((response) => { .then((response) => {
if (Object.keys(response.data.ocs.data.users).length > 0) { if (Object.keys(response.data.ocs.data.users).length > 0) {
context.commit('appendUsers', response.data.ocs.data.users) 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 return false
}) })
@ -237,7 +237,7 @@ const actions = {
.then((response) => { .then((response) => {
if (Object.keys(response.data.ocs.data.users).length > 0) { if (Object.keys(response.data.ocs.data.users).length > 0) {
context.commit('appendUsers', response.data.ocs.data.users) 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 return false
}) })