From 42a882ae62b0972ea23118f93504b1defac75bfc Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Fri, 30 Sep 2016 12:51:49 +0000 Subject: [PATCH] (Retrofit from trunk) Portal : Deadline attributes not displayed properly in ManageBrick SVN:2.3[4432] --- .../src/controllers/managebrickcontroller.class.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php index c942af92fb..07ebf23636 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php @@ -28,6 +28,7 @@ use \MetaModel; use \AttributeDefinition; use \AttributeDate; use \AttributeDateTime; +use \AttributeSubItem; use \DBSearch; use \DBObjectSearch; use \DBObjectSet; @@ -371,7 +372,7 @@ class ManageBrickController extends BrickController ); } } - + $oAttDef = MetaModel::GetAttributeDef($sCurrentClass, $sItemAttr); if ($oAttDef->IsExternalKey()) { @@ -391,6 +392,10 @@ class ManageBrickController extends BrickController } } } + elseif ($oAttDef instanceof AttributeSubItem) + { + $sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr)); + } else { $sValue = $oAttDef->GetValueLabel($oCurrentRow->Get($sItemAttr));