diff options
| author | Julien Veyssier <eneiluj@posteo.net> | 2021-08-23 11:54:13 +0300 |
|---|---|---|
| committer | Julien Veyssier <eneiluj@posteo.net> | 2021-09-01 18:23:06 +0300 |
| commit | c11689b5b28afb4ad555d137a05be14ad8f0fa86 (patch) | |
| tree | cfa98b21410dc1927a1734611bd6a63f411711f1 /apps/settings/src | |
| parent | 1a4e4b87aaa27e632574c65eebbe3f6fa1e5f1c9 (diff) | |
avoid 'No users in here' in user list when there actually are users
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Diffstat (limited to 'apps/settings/src')
| -rw-r--r-- | apps/settings/src/components/UserList.vue | 9 | ||||
| -rw-r--r-- | apps/settings/src/store/users.js | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue index afbc1de76f8..68c07d1ab21 100644 --- a/apps/settings/src/components/UserList.vue +++ b/apps/settings/src/components/UserList.vue @@ -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() + } }) }, diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js index 475486d6c40..ef93f7e40ab 100644 --- a/apps/settings/src/store/users.js +++ b/apps/settings/src/store/users.js @@ -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)) { |