Merge branch 'admin-users' into shigusegubu-themes3
This commit is contained in:
commit
714591e63c
5 changed files with 4 additions and 8 deletions
|
|
@ -22,7 +22,7 @@
|
|||
v-if="sortedChatList.length > 0"
|
||||
class="timeline"
|
||||
>
|
||||
<List :items="sortedChatList">
|
||||
<List :external-items="sortedChatList">
|
||||
<template #item="{item}">
|
||||
<ChatListItem
|
||||
:key="item.id"
|
||||
|
|
|
|||
|
|
@ -20,8 +20,10 @@
|
|||
flex-direction: column;
|
||||
gap: 1em;
|
||||
border-right: 1px solid var(--border);
|
||||
padding: 0 1em;
|
||||
padding: 1em;
|
||||
margin-right: 1em;
|
||||
overflow: auto visible;
|
||||
flex: 0 0 auto;
|
||||
|
||||
> div {
|
||||
flex: 0 1 auto;
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@
|
|||
class="UsersTab"
|
||||
:label="$t('admin_dash.users.management')"
|
||||
>
|
||||
<h3>
|
||||
{{ $t('admin_dash.users.title') }}
|
||||
</h3>
|
||||
<div class="splitter">
|
||||
<div class="filters-section">
|
||||
<label class="filter">
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ const UserReportingModal = {
|
|||
return !!this.$store.state.users.currentUser
|
||||
},
|
||||
isOpen() {
|
||||
console.log(this.reportModal)
|
||||
return this.isLoggedIn && this.reportModal.activated
|
||||
},
|
||||
userId() {
|
||||
|
|
|
|||
|
|
@ -15,12 +15,10 @@ export const useReportsStore = defineStore('reports', {
|
|||
}),
|
||||
actions: {
|
||||
openUserReportingModal({ userId, statusIds = [] }) {
|
||||
console.log('ASS')
|
||||
const preTickedStatuses = statusIds.map(
|
||||
(id) => window.vuex.state.statuses.allStatusesObject[id],
|
||||
)
|
||||
const preTickedIds = statusIds
|
||||
console.log(preTickedStatuses)
|
||||
const statuses = preTickedStatuses.concat(
|
||||
filter(
|
||||
window.vuex.state.statuses.allStatuses,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue