From b4fc0ef22ef91cbdb868f8e91d1a0922f469c6bd Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 15 Jan 2021 12:16:27 +0100
Subject: [PATCH] FIX #15826 TIME 0:05 error in user redirection
---
src/app/entity/controllers/ListInstanceController.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/app/entity/controllers/ListInstanceController.php b/src/app/entity/controllers/ListInstanceController.php
index 30d27a31076..a7c747f7148 100755
--- a/src/app/entity/controllers/ListInstanceController.php
+++ b/src/app/entity/controllers/ListInstanceController.php
@@ -271,7 +271,13 @@ class ListInstanceController
return ['errors' => 'User not found', 'code' => 400];
}
} elseif (in_array($instance['item_type'], ['entity_id', 'entity'])) {
- $entity = EntityModel::getById(['id' => $instance['item_id'], 'select' => ['enabled']]);
+ if (!is_numeric($instance['item_id'])) {
+ $entity = EntityModel::getByEntityId(['entityId' => $instance['item_id'], 'select' => ['id', 'enabled']]);
+ $instance['item_id'] = $entity['id'];
+ } else {
+ $entity = EntityModel::getById(['id' => $instance['item_id'], 'select' => ['enabled']]);
+ }
+
$instance['item_type'] = 'entity_id';
if (empty($entity) || $entity['enabled'] != 'Y') {
DatabaseModel::rollbackTransaction();
--
GitLab