浏览代码

avoid 'No users in here' in user list when there actually are users

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
tags/v23.0.0beta1
Julien Veyssier 2 年前
父节点
当前提交
c11689b5b2
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 13 次插入8 次删除
  1. 7
    2
      apps/settings/src/components/UserList.vue
  2. 6
    6
      apps/settings/src/store/users.js

+ 7
- 2
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()
}
})
},


+ 6
- 6
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)) {

正在加载...
取消
保存