lqdvi/app2-api
2
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api

Browse Source
This commit is contained in:
David Arranz 2019-11-02 22:57:13 +01:00
commit d055432487
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/entities/entity.model.js
View File

@ -44,7 +44,14 @@ module.exports = function (sequelize, DataTypes) {
Entity.EventsReservations = Entity.hasMany(models.EventReservation, { foreignKey: 'entityId', as: 'reservations' }); Entity.EventsReservations = Entity.hasMany(models.EventReservation, { foreignKey: 'entityId', as: 'reservations' });
}; };
Entity.addScope('withEntityTypes', () => {
return {
include: [{
model: sequelize.models.EntityType,
as: 'types',
}]
}
});
Entity.addScope('onlyColleges', () => { Entity.addScope('onlyColleges', () => {
return { return {

4
modules/entities/entity.routes.js
View File

@ -66,7 +66,9 @@ routes.get('/admin/entities/partners/:id',
routes.get('/admin/entities/:id', routes.get('/admin/entities/:id',
//isAdministratorUser, //isAdministratorUser,
entityController.findOne(), entityController.findOne({
scopes: ['withEntityTypes'],
}),
); );
routes.get('/admin/entitytypes/', routes.get('/admin/entitytypes/',