From ba11e78f56f7d5fcfa5c817b25574968c554867e Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 3 Mar 2020 17:09:43 +0100
Subject: [PATCH] FEAT #13342 TIME 0:20 Fix indexing model without entities +
listinstances serialId
---
src/app/entity/controllers/ListInstanceController.php | 2 ++
.../app/indexation/indexing-form/indexing-form.component.ts | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/app/entity/controllers/ListInstanceController.php b/src/app/entity/controllers/ListInstanceController.php
index 36afc5b8a23..9d381414f2e 100755
--- a/src/app/entity/controllers/ListInstanceController.php
+++ b/src/app/entity/controllers/ListInstanceController.php
@@ -56,6 +56,8 @@ class ListInstanceController
$listInstances[$key]['labelToDisplay'] = Entitymodel::getByEntityId(['entityId' => $value['item_id'], 'select' => ['entity_label']])['entity_label'];
$listInstances[$key]['descriptionToDisplay'] = '';
} else {
+ $user = UserModel::getByLogin(['login' => $value['item_id'], 'select' => ['id']]);
+ $listInstances[$key]['userId'] = $user['id'];
$listInstances[$key]['labelToDisplay'] = UserModel::getLabelledUserById(['login' => $value['item_id']]);
$listInstances[$key]['descriptionToDisplay'] = UserModel::getPrimaryEntityByUserId(['userId' => $value['item_id']])['entity_label'];
}
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
index ef6a1aa56bd..2239c721d36 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -786,7 +786,9 @@ export class IndexingFormComponent implements OnInit {
}
if (field.identifier == 'initiator' && this.mode == 'indexation' && this.functions.empty(field.default_value)) {
- field.default_value = this.headerService.user.entities.filter((entity: any) => entity.primary_entity == 'Y')[0].id;
+ if (this.headerService.user.entities[0]) {
+ field.default_value = this.headerService.user.entities.filter((entity: any) => entity.primary_entity == 'Y')[0].id;
+ }
}
if (fieldExist) {
--
GitLab