NoLog.cz/gancio-upstream
6
0
Fork 0
mirror of https://framagit.org/les/gancio.git synced 2025-01-31 16:42:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: event exports when collection_in_home and tags or places are selected

Browse source
This commit is contained in:
lesion 2024-01-08 00:00:37 +01:00
parent 90deb79d6b
commit f160430625
No known key found for this signature in database
GPG key ID: 352918250B012177
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
server/api/controller/event.js
View file

@ -728,23 +728,24 @@ const eventController = {
const older = req.query.older || false
const show_multidate = settings.allow_multidate_event && helpers.queryParamToBool(req.query.show_multidate, true)
// typeof req.query.show_multidate !== 'undefined' ? req.query.show_multidate !== 'false' : true
const show_recurrent = settings.allow_recurrent_event && helpers.queryParamToBool(req.query.show_recurrent, settings.recurrent_event_visible)
// typeof req.query.show_recurrent !== 'undefined' ? req.query.show_recurrent === 'true' : settings.recurrent_event_visible
if (settings.collection_in_home) {
return res.json(await collectionController._getEvents({
let events = []
if (settings.collection_in_home && !(tags || places)) {
events = await collectionController._getEvents({
name: settings.collection_in_home,
start,
end,
limit
}))
})
} else {
return res.json(await eventController._select({
events = await eventController._select({
start, end, query, places, tags, show_recurrent, show_multidate, limit, page, older
}))
})
}
return res.json(events)
},
/**