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

fix tags/places filters

Browse Source
This commit is contained in:
lesion
2022-01-25 01:30:47 +01:00
parent 4e28423688
commit ef65d3f9dd
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,12 +504,20 @@ const eventController = {
where.start_datetime = { [Op.lte]: end } where.start_datetime = { [Op.lte]: end }
} }
if (places || tags) { if (tags && places) {
where[Op.or] = { where[Op.or] = {
placeId: places ? places.split(',') : [], placeId: places ? places.split(',') : [],
'$tags.tag$': tags ? tags.split(',') : [] '$tags.tag$': tags.split(',')
}
} }
}
if (tags) {
where['$tags.tag$'] = tags.split(',')
}
if (places) {
where.placeId = places.split(',')
}
const events = await Event.findAll({ const events = await Event.findAll({
where, where,

18
server/api/controller/export.js
View File

@@ -17,12 +17,22 @@ const exportController = {
const where = {} const where = {}
const yesterday = moment().subtract('1', 'day').unix() const yesterday = moment().subtract('1', 'day').unix()
if (places || tags) {
if (tags && places) {
where[Op.or] = { where[Op.or] = {
placeId: places ? places.split(',') : [], placeId: places ? places.split(',') : [],
'$tags.tag$': tags ? tags.split(',') : [] '$tags.tag$': tags.split(',')
}
} }
}
if (tags) {
where['$tags.tag$'] = tags.split(',')
}
if (places) {
where.placeId = places.split(',')
}
if (!show_recurrent) { if (!show_recurrent) {
where.parentId = null where.parentId = null
} }