From 316d1cf45cfbfd8552357d6a8b727f8c7ad2e0e4 Mon Sep 17 00:00:00 2001 From: les Date: Tue, 24 Mar 2020 18:50:32 +0100 Subject: [PATCH] show only future unconfirmed events in admin --- pages/Admin.vue | 2 +- plugins/filters.js | 2 +- server/api/controller/event.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pages/Admin.vue b/pages/Admin.vue index f4665461..9bac2ec9 100644 --- a/pages/Admin.vue +++ b/pages/Admin.vue @@ -42,7 +42,7 @@ 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')}} 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 el-tab-pane.pt-1 diff --git a/plugins/filters.js b/plugins/filters.js index bc41c7e3..29da3cc3 100644 --- a/plugins/filters.js +++ b/plugins/filters.js @@ -32,8 +32,8 @@ export default ({ app, store }) => { recurrent = app.i18n.tc(`event.recurrent_${frequency}_${type}`, days.length, { days: d }) } return recurrent - }) + Vue.filter('when', (event) => { const start = moment.unix(event.start_datetime) const end = moment.unix(event.end_datetime) diff --git a/server/api/controller/event.js b/server/api/controller/event.js index e4edcd2a..439f8b07 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -176,7 +176,8 @@ const eventController = { const events = await Event.findAll({ where: { parentId: null, - is_visible: false + is_visible: false, + start_datetime: { [Op.gt]: moment.unix() } }, order: [['start_datetime', 'ASC']], include: [Tag, Place]