From f0685e33e1af714bffb92c97f39570802cf3d108 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 19 Dec 2024 15:13:58 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B08031=20-=20Add=20robustness=20and=20fix?= =?UTF-8?q?=20SF=20parameter=20binding=20being=20ambiguous=20in=20extensio?= =?UTF-8?q?ns=20bricks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php | 5 +++++ .../portal/src/Controller/ObjectController.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php index 8c1bfdd7d..ff360b09d 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php @@ -687,6 +687,11 @@ abstract class AbstractBrick */ public static function LoadClassDefinitionFromPortalProperties($aPortalProperties) { + // Check if they are any brick templates + if(!array_key_exists('bricks', $aPortalProperties['templates']) || !is_array($aPortalProperties['templates']['bricks'])) { + return; + } + // Get the bricks templates $aBricksTemplates = $aPortalProperties['templates']['bricks']; $sClassFQCN = static::class; diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php index e430e62ae..c6c656d26 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php @@ -98,7 +98,7 @@ class ObjectController extends BrickController protected ObjectFormHandlerHelper $oObjectFormHandlerHelper, protected NavigationRuleHelper $oNavigationRuleHelper, protected ContextManipulatorHelper $oContextManipulatorHelper, - protected array $aCombodoPortalInstanceConf + protected array $aCombodoPortalInstanceConf = [] ) { ObjectBrick::InitializeSelf($this->aCombodoPortalInstanceConf);