Page MenuHomePhorge
Files F85805787

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/changelog.d/fix-admin-user-list.fix b/changelog.d/fix-admin-user-list.fix
new file mode 100644
index 0000000000..2f7c7ba636
--- /dev/null
+++ b/changelog.d/fix-admin-user-list.fix
@@ -0,0 +1 @@
+Fix admin user list
diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js
index 68bc46aa2e..994b33398b 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.js
+++ b/src/components/settings_modal/admin_tabs/users_tab.js
@@ -1,117 +1,119 @@
import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
import Checkbox from 'src/components/checkbox/checkbox.vue'
import List from 'src/components/list/list.vue'
import ModerationTools from 'src/components/moderation_tools/moderation_tools.vue'
import Select from 'src/components/select/select.vue'
import AdminUserCard from 'src/components/settings_modal/admin_tabs/admin_user_card.vue'
import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
const UsersTab = {
components: {
Checkbox,
Select,
BasicUserCard,
List,
AdminUserCard,
ModerationTools,
},
data() {
return {
filtersOrigin: 'local',
filtersActivity: 'all',
filtersPrivileges: 'all',
filtersNeedApproval: false,
filtersUnconfirmed: false,
filtersQuery: '',
filtersName: '',
filtersEmail: '',
expandedUser: null,
}
},
computed: {
/**
* do we filter for admins?
* @returns {boolean}
*/
filtersIsAdmin() {
return (
this.filtersPrivileges === 'admin' ||
this.filtersPrivileges === 'modsnadmins'
)
},
/**
* do we filter for moderators?
* @returns {boolean}
*/
filtersIsModerator() {
return (
this.filtersPrivileges === 'moderator' ||
this.filtersPrivileges === 'modsnadmins'
)
},
/**
* do we filter for active users?
* @returns {boolean}
*/
filtersActive() {
return this.filtersActivity === 'active'
},
/**
* do we filter for deactivated users?
* @returns {boolean}
*/
filtersDeactivated() {
return this.filtersActivity === 'deactivated'
},
/**
* do we filter for local users?
* @returns {boolean}
*/
filtersLocal() {
return this.filtersOrigin === 'local'
},
/**
* do we filter for external users?
* @return {boolean}
*/
filtersExternal() {
return this.filtersOrigin === 'external'
},
fetchOptions() {
const filters = {
isAdmin: this.filtersIsAdmin,
isModerator: this.filtersIsModerator,
active: this.filtersActive,
deactivated: this.filtersDeactivated,
local: this.filtersLocal,
external: this.filtersExternal,
needApproval: this.filtersNeedApproval,
unconfirmed: this.filtersUnconfirmed,
}
return {
query: this.filtersQuery,
name: this.filtersName,
email: this.filtersEmail,
pageSize: 50,
filters,
}
},
},
methods: {
fetchUsers(page) {
- return useAdminSettingsStore().fetchUsers({
- ...this.fetchOptions,
- page,
- })
+ return useAdminSettingsStore()
+ .fetchUsers({
+ ...this.fetchOptions,
+ page,
+ })
+ .then((k) => k.items)
},
},
watch: {
fetchOptions() {
this.$refs.usersList?.reset()
},
},
}
export default UsersTab

File Metadata

Mime Type
text/x-diff
Expires
Mon, Oct 12, 2:30 AM (1 d, 16 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1786020
Default Alt Text
(3 KB)

Event Timeline