minor
This commit is contained in:
@@ -69,7 +69,6 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
console.error('dentro mounted di editor!')
|
||||
this.editor = new Editor({
|
||||
onUpdate: _.debounce(({ getHTML }) => this.$emit('input', getHTML()), 300),
|
||||
content: this.value,
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
Search(past-filter recurrent-filter)
|
||||
|
||||
.row.m-0
|
||||
.p-0.col-sm-6.col-lg-4.col-xl-4(v-for='event in events' :key='event.id')
|
||||
a.d-block.d-sm-none.sticky(:id='event.newDay' v-if='event.newDay')
|
||||
.p-0.col-sm-6.col-lg-4.col-xl-4(v-for='event in events' :key='event.id + event.start_datetime')
|
||||
a.d-block.d-sm-none(:id='event.newDay' v-if='event.newDay')
|
||||
el-divider {{event.start_datetime|day}}
|
||||
Event(
|
||||
:id='event.start_datetime'
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
v-model='showPast'
|
||||
)
|
||||
|
||||
el-autocomplete.mb-1#search.inline-input(placeholder='Cerca' prefix-icon='el-icon-search'
|
||||
el-autocomplete.mb-1#search.inline-input(:placeholder='$t("common.filter")' prefix-icon='el-icon-search'
|
||||
highlight-first-item
|
||||
v-model='search' :debounce='200'
|
||||
:fetch-suggestions='querySearch' clearable
|
||||
@@ -27,7 +27,7 @@
|
||||
i.float-right.el-icon-place(v-if='item.type==="place"')
|
||||
i.float-right.el-icon-collection-tag(v-if='item.type==="tag"')
|
||||
br
|
||||
el-tag.mr-1(type='success' v-for='f in filter'
|
||||
el-tag.mr-1(type='success' v-for='f in filter' size='small'
|
||||
disable-transitions closable :key='f.type + f.id'
|
||||
@close='removeFilter(f)') {{f.label}}
|
||||
</template>
|
||||
@@ -49,9 +49,10 @@ export default {
|
||||
...mapState(['tags', 'places', 'filters', 'settings']),
|
||||
// TOFIX: optimize
|
||||
keywords () {
|
||||
const tags = this.tags.map(t => ({ type: 'tag', label: t, weigth: t.weigth, id: t }))
|
||||
const tags = this.tags.map(t => ({ type: 'tag', label: t.tag, weigth: t.weigth, id: t.tag }))
|
||||
const places = this.places.map(p => ({ type: 'place', label: p.name, weigth: p.weigth, id: p.id }))
|
||||
return tags.concat(places).sort((a, b) => b.weigth - a.weigth)
|
||||
const keywords = tags.concat(places).sort((a, b) => b.weigth - a.weigth)
|
||||
return keywords
|
||||
},
|
||||
showPast: {
|
||||
set (value) { this.showPastEvents(value) },
|
||||
@@ -62,15 +63,7 @@ export default {
|
||||
get () { return this.filters.show_recurrent_events }
|
||||
},
|
||||
filter () {
|
||||
// set (filters) {
|
||||
// const tags = filters.filter(f => f[0] === 't').map(t => t.slice(1))
|
||||
// this.setSearchTags(tags)
|
||||
// const places = filters.filter(f => f[0] === 'p').map(p => +p.slice(1))
|
||||
// this.setSearchPlaces(places)
|
||||
// },
|
||||
// get () {
|
||||
return this.filters.tags.concat(this.filters.places)
|
||||
// }
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
:type='data.row.blocked?"danger":"warning"'
|
||||
@click='toggleUserBlock(data.row)') {{data.row.blocked?$t('admin.unblock'):$t('admin.block')}}
|
||||
|
||||
//- div(v-show='enable_federation')
|
||||
div(v-show='enable_federation')
|
||||
el-divider {{$t('common.resources')}}
|
||||
el-table(:data='paginatedResources' small :row-style='resourceStyle')
|
||||
el-table-column(:label="$t('common.event')")
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { mapState, mapActions, mapGetters } from 'vuex'
|
||||
import { mapState, mapActions } from 'vuex'
|
||||
|
||||
export default {
|
||||
name: 'Federation',
|
||||
@@ -141,14 +141,13 @@ export default {
|
||||
},
|
||||
filteredUsers () {
|
||||
if (!this.usersFilter) { return this.users }
|
||||
this.usersFilter = this.usersFilter.toLowerCase()
|
||||
console.error(this.users)
|
||||
return this.users.filter(user => user.name.includes(this.usersFilter) || user.preferredName.includes(this.usersFilter))
|
||||
const usersFilter = this.usersFilter.toLowerCase()
|
||||
return this.users.filter(user => user.name.includes(usersFilter) || user.preferredName.includes(usersFilter))
|
||||
},
|
||||
filteredInstances () {
|
||||
if (!this.instancesFilter) { return this.instances }
|
||||
this.instancesFilter = this.instancesFilter.toLowerCase()
|
||||
return this.instances.filter(instance => instance.name.includes(this.instancesFilter) || instance.domain.includes(this.instancesFilter))
|
||||
const instancesFilter = this.instancesFilter.toLowerCase()
|
||||
return this.instances.filter(instance => instance.name.includes(instancesFilter) || instance.domain.includes(instancesFilter))
|
||||
},
|
||||
paginatedSelectedUsers () {
|
||||
return this.filteredUsers.slice((this.userPage - 1) * this.perPage,
|
||||
|
||||
Reference in New Issue
Block a user