From 7ea1e8541f20a0de126ebc1f5c3aefb8303273e1 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 27 Apr 2020 19:55:28 +0200
Subject: [PATCH] FEAT #13664 TIME 0:20 Alfresco entities
---
src/app/entity/models/EntityModelAbstract.php | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/app/entity/models/EntityModelAbstract.php b/src/app/entity/models/EntityModelAbstract.php
index 64eaae4d530..e798d8e4cf6 100755
--- a/src/app/entity/models/EntityModelAbstract.php
+++ b/src/app/entity/models/EntityModelAbstract.php
@@ -341,15 +341,24 @@ abstract class EntityModelAbstract
$entitiesAllowed = EntityModel::getAllEntitiesByUserId(['userId' => $aArgs['userId']]);
}
- $allEntities = EntityModel::get(['select' => ['id', 'entity_id', 'entity_label', 'parent_entity_id'], 'where' => ['enabled = ?'], 'data' => ['Y'], 'orderBy' => ['parent_entity_id']]);
+ $allEntities = EntityModel::get([
+ 'select' => ['e1.id', 'e1.entity_id', 'e1.entity_label', 'e1.parent_entity_id', 'e2.id as parent_id'],
+ 'table' => ['entities e1', 'entities e2'],
+ 'left_join' => ['e1.parent_entity_id = e2.entity_id'],
+ 'where' => ['e1.enabled = ?'],
+ 'data' => ['Y'],
+ 'orderBy' => ['e1.parent_entity_id']
+ ]);
foreach ($allEntities as $key => $value) {
$allEntities[$key]['serialId'] = $value['id'];
$allEntities[$key]['id'] = $value['entity_id'];
if (empty($value['parent_entity_id'])) {
+ $allEntities[$key]['parentSerialId'] = '#';
$allEntities[$key]['parent'] = '#';
$allEntities[$key]['icon'] = "fa fa-building";
} else {
+ $allEntities[$key]['parentSerialId'] = $value['parent_id'];
$allEntities[$key]['parent'] = $value['parent_entity_id'];
$allEntities[$key]['icon'] = "fa fa-sitemap";
}
--
GitLab