composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source
This commit is contained in:
Stephen Abello
2024-12-19 15:16:51 +01:00
parent 2a888cf5af f0685e33e1
commit ea5473ad77
6 changed files with 185 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php
View File

@@ -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;

2
datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
View File

@@ -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);