From f70c24584d52ee0dfa908ad0d20233afa5d8edf5 Mon Sep 17 00:00:00 2001 From: les Date: Tue, 27 Oct 2020 11:57:11 +0100 Subject: [PATCH] fix events selection --- server/api/controller/event.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/api/controller/event.js b/server/api/controller/event.js index 98da3b40..87ce338c 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -424,12 +424,15 @@ const eventController = { // confirmed event only recurrent: null, is_visible: true, - end_datetime: { [Op.gt]: start } + [Op.or]: { + start_datetime: { [Op.gt]: start }, + end_datetime: { [Op.gt]: start } + } } - if (end) { - where.end_datetime = { [Op.lt]: end } - } + // if (end) { + // where.end_datetime = { [Op.lt]: end } + // } if (places) { where.placeId = places.split(',')