Skip to content

Commit be0dcd0

Browse files
Merge pull request #61122 from nextcloud/backport/60504/stable34
[stable34] fix(settings): Show loading spinner while searching accounts
2 parents 63c5ca3 + cb11d8c commit be0dcd0

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

apps/settings/src/components/UserList.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<NcEmptyContent
2222
v-if="filteredUsers.length === 0"
2323
class="empty"
24-
:name="isInitialLoad && loading.users ? null : t('settings', 'No accounts')">
24+
:name="loading.users ? null : t('settings', 'No accounts')">
2525
<template #icon>
2626
<NcLoadingIcon
27-
v-if="isInitialLoad && loading.users"
27+
v-if="loading.users"
2828
:name="t('settings', 'Loading accounts …')"
2929
:size="64" />
3030
<NcIconSvgWrapper v-else :path="mdiAccountGroupOutline" :size="64" />
@@ -145,7 +145,6 @@ export default {
145145
146146
newUser: { ...newUser },
147147
editingUser: null,
148-
isInitialLoad: true,
149148
}
150149
},
151150
@@ -241,7 +240,6 @@ export default {
241240
242241
// watch url change and group select
243242
async selectedGroup(val) {
244-
this.isInitialLoad = true
245243
// if selected is the disabled group but it's empty
246244
await this.redirectIfDisabled()
247245
this.$store.commit('resetUsers')
@@ -312,7 +310,6 @@ export default {
312310
showError('Failed to load accounts')
313311
}
314312
this.loading.users = false
315-
this.isInitialLoad = false
316313
},
317314
318315
closeDialog() {

dist/settings-vue-settings-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.

dist/settings-vue-settings-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.

0 commit comments

Comments
 (0)