From 5bbd1ee88a4df0ab0bcbf0c8a6a9793c9d541a03 Mon Sep 17 00:00:00 2001 From: lesion Date: Tue, 23 Jul 2019 16:26:54 +0200 Subject: [PATCH] minor --- server/api/controller/event.js | 9 ++++----- server/firstrun.js | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/api/controller/event.js b/server/api/controller/event.js index b9566009..e2b4d781 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -90,11 +90,7 @@ const eventController = { let event = await Event.findByPk(id, { plain: true, attributes: { - exclude: ['createdAt', 'updatedAt', 'start_datetime', 'end_datetime'], - include: [ - [Sequelize.literal('start_datetime*1000'), 'start_datetime'], - [Sequelize.literal('end_datetime*1000'), 'end_datetime'] - ] + exclude: ['createdAt', 'updatedAt'] }, include: [ { model: Tag, attributes: ['tag', 'weigth'], through: { attributes: [] } }, @@ -104,6 +100,9 @@ const eventController = { order: [ [Comment, 'id', 'DESC'] ] }) + event.start_datetime = event.start_datetime*1000 + event.end_datetime = event.end_datetime*1000 + if (event && (event.is_visible || is_admin)) { res.json(event) } else { diff --git a/server/firstrun.js b/server/firstrun.js index ed644c54..e09e87ba 100644 --- a/server/firstrun.js +++ b/server/firstrun.js @@ -50,6 +50,9 @@ If you want to `) const settings = require('./api/controller/settings') await settings.set('allow_registration', true) await settings.set('allow_anon_event', true) + await settings.set('allow_recurrent_event', true) + await settings.set('recurrent_event_visible', true) + await settings.set('allow_comments', true) // add default notification consola.info('Add default notification')