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

minor

Browse Source
This commit is contained in:
les
2021-04-10 00:20:42 +02:00
parent 2d34fd41a5
commit 945b33f8bf
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ const eventController = {
}, },
async get (req, res) { async get (req, res) {
log.error('get')
const format = req.params.format || 'json' const format = req.params.format || 'json'
const is_admin = req.user && req.user.is_admin const is_admin = req.user && req.user.is_admin
const id = Number(req.params.event_id) const id = Number(req.params.event_id)
@@ -97,7 +98,7 @@ const eventController = {
exclude: ['createdAt', 'updatedAt', 'placeId'] exclude: ['createdAt', 'updatedAt', 'placeId']
}, },
include: [ include: [
{ model: Tag, required: false, attributes: ['tag', 'weigth'], through: { attributes: [] } }, { model: Tag, required: false, attributes: ['tag'], through: { attributes: [] } },
{ model: Place, attributes: ['name', 'address', 'id'] }, { model: Place, attributes: ['name', 'address', 'id'] },
{ {
model: Resource, model: Resource,

5
server/taskManager.js
View File

@@ -99,7 +99,8 @@ const TS = new TaskManager()
TS.add(new Task({ TS.add(new Task({
name: 'CREATE_RECURRENT_EVENT', name: 'CREATE_RECURRENT_EVENT',
method: eventController._createRecurrent, method: eventController._createRecurrent,
repeatDelay: hour / 2 // check each half an hour repeatDelay: hour / 2, // check each half an hour
repeat: true
})) }))
// remove unrelated places // remove unrelated places
@@ -107,6 +108,7 @@ TS.add(new Task({
name: 'CLEAN_UNUSED_PLACES', name: 'CLEAN_UNUSED_PLACES',
method: placeHelpers._cleanUnused, method: placeHelpers._cleanUnused,
repeatDelay: day, repeatDelay: day,
repeat: true,
callAtStart: true callAtStart: true
})) }))
@@ -114,6 +116,7 @@ TS.add(new Task({
name: 'CLEAN_UNUSED_TAGS', name: 'CLEAN_UNUSED_TAGS',
method: tagHelpers._cleanUnused, method: tagHelpers._cleanUnused,
repeatDelay: day, repeatDelay: day,
repeat: true,
callAtStart: true callAtStart: true
})) }))