Skip to content
Snippets Groups Projects
Verified Commit ba11e78f authored by Damien's avatar Damien
Browse files

FEAT #13342 TIME 0:20 Fix indexing model without entities + listinstances serialId

parent 55e8546b
No related branches found
No related tags found
No related merge requests found
...@@ -56,6 +56,8 @@ class ListInstanceController ...@@ -56,6 +56,8 @@ class ListInstanceController
$listInstances[$key]['labelToDisplay'] = Entitymodel::getByEntityId(['entityId' => $value['item_id'], 'select' => ['entity_label']])['entity_label']; $listInstances[$key]['labelToDisplay'] = Entitymodel::getByEntityId(['entityId' => $value['item_id'], 'select' => ['entity_label']])['entity_label'];
$listInstances[$key]['descriptionToDisplay'] = ''; $listInstances[$key]['descriptionToDisplay'] = '';
} else { } 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]['labelToDisplay'] = UserModel::getLabelledUserById(['login' => $value['item_id']]);
$listInstances[$key]['descriptionToDisplay'] = UserModel::getPrimaryEntityByUserId(['userId' => $value['item_id']])['entity_label']; $listInstances[$key]['descriptionToDisplay'] = UserModel::getPrimaryEntityByUserId(['userId' => $value['item_id']])['entity_label'];
} }
......
...@@ -786,7 +786,9 @@ export class IndexingFormComponent implements OnInit { ...@@ -786,7 +786,9 @@ export class IndexingFormComponent implements OnInit {
} }
if (field.identifier == 'initiator' && this.mode == 'indexation' && this.functions.empty(field.default_value)) { 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) { if (fieldExist) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment