encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show only future unconfirmed events in admin

Browse Source
This commit is contained in:
les
2020-03-24 18:50:32 +01:00
parent 488174e1b5
commit ba6d797435
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/Admin.vue
View File

@@ -42,7 +42,7 @@
el-button(type='primary' @click='confirm(data.row.id)' size='mini') {{$t('common.confirm')}} el-button(type='primary' @click='confirm(data.row.id)' size='mini') {{$t('common.confirm')}}
el-button(type='success' @click='preview(data.row.id)' size='mini') {{$t('common.preview')}} el-button(type='success' @click='preview(data.row.id)' size='mini') {{$t('common.preview')}}
client-only client-only
el-pagination(:page-size='perPage' :currentPage.sync='eventPage' :total='events.length') el-pagination(v-if='events.length>perPage' :page-size='perPage' :currentPage.sync='eventPage' :total='events.length')
//- ANNOUNCEMENTS //- ANNOUNCEMENTS
el-tab-pane.pt-1 el-tab-pane.pt-1

2
plugins/filters.js
View File

@@ -32,8 +32,8 @@ export default ({ app, store }) => {
recurrent = app.i18n.tc(`event.recurrent_${frequency}_${type}`, days.length, { days: d }) recurrent = app.i18n.tc(`event.recurrent_${frequency}_${type}`, days.length, { days: d })
} }
return recurrent return recurrent
}) })
Vue.filter('when', (event) => { Vue.filter('when', (event) => {
const start = moment.unix(event.start_datetime) const start = moment.unix(event.start_datetime)
const end = moment.unix(event.end_datetime) const end = moment.unix(event.end_datetime)

3
server/api/controller/event.js
View File

@@ -176,7 +176,8 @@ const eventController = {
const events = await Event.findAll({ const events = await Event.findAll({
where: { where: {
parentId: null, parentId: null,
is_visible: false is_visible: false,
start_datetime: { [Op.gt]: moment.unix() }
}, },
order: [['start_datetime', 'ASC']], order: [['start_datetime', 'ASC']],
include: [Tag, Place] include: [Tag, Place]