From a3b5608b149467cc7298152c0bfc77d8b0012a5f Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Thu, 31 Oct 2019 13:46:12 +0100
Subject: [PATCH] a

---
 modules/entities/entity.model.js  | 9 ++++++++-
 modules/entities/entity.routes.js | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/entities/entity.model.js b/modules/entities/entity.model.js
index 1f0ce7c..0a4dfd0 100644
--- a/modules/entities/entity.model.js
+++ b/modules/entities/entity.model.js
@@ -44,7 +44,14 @@ module.exports = function (sequelize, DataTypes) {
         Entity.EventsReservations = Entity.hasMany(models.EventReservation, { foreignKey: 'entityId', as: 'reservations' });
     };
 
-
+    Entity.addScope('withEntityTypes', () => {
+        return {
+            include: [{
+                model: sequelize.models.EntityType,
+                as: 'types',
+            }]
+        }
+    });
 
     Entity.addScope('onlyColleges', () => {
         return {
diff --git a/modules/entities/entity.routes.js b/modules/entities/entity.routes.js
index d0cd0ec..4828ea3 100644
--- a/modules/entities/entity.routes.js
+++ b/modules/entities/entity.routes.js
@@ -67,7 +67,9 @@ routes.get('/admin/entities/partners/:id',
 
 routes.get('/admin/entities/:id',
     //isAdministratorUser,
-    entityController.findOne(),
+    entityController.findOne({
+        scopes: ['withEntityTypes'],
+    }),
 );
 
 routes.get('/admin/entitytypes/',