From 259eb7e02bb3a69c04d058e54d8db40de0db1914 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 17 Aug 2019 14:42:20 +0200 Subject: [PATCH] a --- modules/events/event.controller.js | 1 - modules/events/event.routes.js | 5 +++++ modules/events/events_inscriptions.model.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index 3bf0e5d..5e9928c 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -126,7 +126,6 @@ const extraControllers = { } }, - deleteInscription: async (req, res, next) => { const params = extractParamsFromRequest(req, res, {}); const user = req.user; diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index 85f41fa..6dea1da 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -321,6 +321,11 @@ routes.get('/admin/events/:id/partners', eventController.findPartners, ); +routes.get('/admin/events/:eventId/partners/:entityId/reservations', + // isAdministratorUser, + eventReservationController.find(), +); + routes.post('/admin/reservations', // isAdministratorUser, diff --git a/modules/events/events_inscriptions.model.js b/modules/events/events_inscriptions.model.js index d076c43..ff14d16 100644 --- a/modules/events/events_inscriptions.model.js +++ b/modules/events/events_inscriptions.model.js @@ -72,7 +72,7 @@ module.exports = function (sequelize, DataTypes) { EventInscription.associate = function (models) { EventInscription.Event = EventInscription.belongsTo(models.Event, { foreignKey: 'eventId', as: 'event' }); - EventInscription.Reservation = EventInscription.belongsTo(models.EventReservation, { foreignKey: 'reservationId', as: 'reservation', onDelete: 'set null' }); + EventInscription.Reservation = EventInscription.belongsTo(models.EventReservation, { foreignKey: 'reservationId', as: 'reservation'}); EventInscription.User = EventInscription.belongsTo(models.User, { foreignKey: 'userId', as: 'user' }); EventInscription.UserValidate = EventInscription.belongsTo(models.User, { foreignKey: 'validateUserId' }); };