From 3f2d126dba95ace251cf49f952ffa0ada6729f65 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Sun, 14 Apr 2019 16:20:31 +0000 Subject: [eventmanager] show config name instead of config id in event table - change models/migrations for config association --- server/models/config.js | 1 + server/models/event.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'server/models') diff --git a/server/models/config.js b/server/models/config.js index ae728f6..84f3d1b 100644 --- a/server/models/config.js +++ b/server/models/config.js @@ -24,6 +24,7 @@ module.exports = (sequelize, DataTypes) => { config.belongsToMany(models.entry, { as: 'entries', through: ConfigXEntry, foreignKey: 'configId', otherKey: 'entryId' }) config.hasMany(models.group, { as: 'groups' }) config.hasMany(models.client, { as: 'clients' }) + config.hasMany(models.event, { as: 'events'}) } return config } diff --git a/server/models/event.js b/server/models/event.js index 11a35e7..00f72c7 100644 --- a/server/models/event.js +++ b/server/models/event.js @@ -9,7 +9,6 @@ module.exports = (sequelize, DataTypes) => { }, name: DataTypes.STRING, description: DataTypes.STRING(2048), - config: DataTypes.INTEGER, times: DataTypes.STRING(4096), important: DataTypes.BOOLEAN }, { @@ -21,6 +20,8 @@ module.exports = (sequelize, DataTypes) => { var GroupXEvent = sequelize.define('group_x_event', { blacklist: DataTypes.BOOLEAN }, { timestamps: false, freezeTableName: true }) event.belongsToMany(models.group, { as: 'groups', through: GroupXEvent, foreignKey: 'eventId', otherKey: 'groupId' }) + + event.belongsTo(models.config, { as: 'config' }) } return event } -- cgit v1.2.3-55-g7522