Merge branch 'master' into dev

This commit is contained in:
lesion
2022-09-21 12:34:21 +02:00
12 changed files with 713 additions and 595 deletions

View File

@@ -570,8 +570,8 @@ const eventController = {
let tags = []
if (body.tags) {
tags = await tagController._findOrCreate(body.tags)
await event.setTags(tags)
}
await event.setTags(tags)
let newEvent = await Event.findByPk(event.id, { include: [Tag, Place] })
newEvent = newEvent.get()

View File

@@ -1,9 +1,5 @@
const Sequelize = require('sequelize')
// this is an hack: https://github.com/sequelize/sequelize/pull/14800
const livePatchMariaDBDialect = require('sequelize/lib/dialects/mariadb/query')
livePatchMariaDBDialect.prototype.handleJsonSelectQuery = () => null
const Umzug = require('umzug')
const path = require('path')
const config = require('../../config')