mirrors/nextcloud-server
3
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-10-26 19:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25879 from nextcloud/fix/user-list-infinite-loading

Browse Source 
Fix user list infinite loading state in user settings
This commit is contained in:
szaimen 2021-09-03 11:43:17 +02:00 committed by GitHub
commit 46837e28d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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

6
apps/settings/js/vue-settings-users.js
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

9
apps/settings/src/components/UserList.vue
View File

@ -461,8 +461,13 @@ export default {
group: this.selectedGroup !== 'disabled' ? this.selectedGroup : '',
search: this.searchQuery,
})
.then((response) => {
response ? $state.loaded() : $state.complete()
.then((usersCount) => {
if (usersCount > 0) {
$state.loaded()
}
if (usersCount < this.usersLimit) {
$state.complete()
}
})
},

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

@ -224,11 +224,11 @@ const actions = {
cancelToken: searchRequestCancelSource.token,
})
.then((response) => {
if (Object.keys(response.data.ocs.data.users).length > 0) {
const usersCount = Object.keys(response.data.ocs.data.users).length
if (usersCount > 0) {
context.commit('appendUsers', response.data.ocs.data.users)
return Object.keys(response.data.ocs.data.users).length >= limit
}
return false
return usersCount
})
.catch((error) => {
if (!axios.isCancel(error)) {
@ -241,11 +241,11 @@ const actions = {
cancelToken: searchRequestCancelSource.token,
})
.then((response) => {
if (Object.keys(response.data.ocs.data.users).length > 0) {
const usersCount = Object.keys(response.data.ocs.data.users).length
if (usersCount > 0) {
context.commit('appendUsers', response.data.ocs.data.users)
return Object.keys(response.data.ocs.data.users).length >= limit
}
return false
return usersCount
})
.catch((error) => {
if (!axios.isCancel(error)) {