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

fix next/prev selection on same datetime events

Browse Source
This commit is contained in:
lesion
2022-02-23 09:55:17 +01:00
parent 4e953c0045
commit 5f7fb64de8
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,21 +145,35 @@ const eventController = {
const next = await Event.findOne({ const next = await Event.findOne({
attributes: ['id', 'slug'], attributes: ['id', 'slug'],
where: { where: {
id: { [Op.not]: event.id },
is_visible: true, is_visible: true,
recurrent: null, recurrent: null,
start_datetime: { [Op.gt]: event.start_datetime } [Op.or]: [
{ start_datetime: { [Op.gt]: event.start_datetime } },
{
start_datetime: event.start_datetime,
id: { [Op.gt]: event.id }
}
]
}, },
order: [['start_datetime', 'ASC']] order: [['start_datetime', 'ASC'], ['id', 'ASC']]
}) })
const prev = await Event.findOne({ const prev = await Event.findOne({
attributes: ['id', 'slug'], attributes: ['id', 'slug'],
where: { where: {
is_visible: true, is_visible: true,
id: { [Op.not]: event.id },
recurrent: null, recurrent: null,
start_datetime: { [Op.lt]: event.start_datetime } [Op.or]: [
{ start_datetime: { [Op.lt]: event.start_datetime } },
{
start_datetime: event.start_datetime,
id: { [Op.lt]: event.id }
}
]
}, },
order: [['start_datetime', 'DESC']] order: [['start_datetime', 'DESC'], ['id', 'DESC']]
}) })
// TODO: also check if event is mine // TODO: also check if event is mine