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

inherits the tags from the parent event, fix #138

Browse Source
This commit is contained in:
lesion
2022-01-27 23:15:14 +01:00
parent 0b96e653b1
commit cf51c3aedc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -627,7 +627,8 @@ const eventController = {
log.info(cursor) log.info(cursor)
event.start_datetime = cursor.unix() event.start_datetime = cursor.unix()
event.end_datetime = event.start_datetime + duration event.end_datetime = event.start_datetime + duration
Event.create(event) const newEvent = await Event.create(event)
return newEvent.addTags(e.tags)
}, },
/** /**
@@ -637,8 +638,9 @@ const eventController = {
// select recurrent events and its childs // select recurrent events and its childs
const events = await Event.findAll({ const events = await Event.findAll({
where: { is_visible: true, recurrent: { [Op.ne]: null } }, where: { is_visible: true, recurrent: { [Op.ne]: null } },
include: [{ model: Event, as: 'child', required: false, where: { start_datetime: { [Op.gte]: start_datetime } } }], include: [{ model: Tag, required: false },
order: ['start_datetime'] { model: Event, as: 'child', required: false, where: { start_datetime: { [Op.gte]: start_datetime } }}],
order: [['child', 'start_datetime', 'DESC']]
}) })
// filter events that as no instance in future yet // filter events that as no instance in future yet
const creations = events const creations = events