From 77ecd055b42aa530797337b05b4a2004b04c19c2 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 10 Nov 2020 15:55:20 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02847=20-=20Fix=20crash=20when=20object?= =?UTF-8?q?=20with=20state=20attribute=20has=20no=20state=20defined?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/UI/Component/Title/TitleFactory.php | 12 ++++++++---- sources/application/UI/Helper/UIHelper.php | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sources/application/UI/Component/Title/TitleFactory.php b/sources/application/UI/Component/Title/TitleFactory.php index d888d1054..d810bf2e5 100644 --- a/sources/application/UI/Component/Title/TitleFactory.php +++ b/sources/application/UI/Component/Title/TitleFactory.php @@ -53,11 +53,15 @@ class TitleFactory } if (MetaModel::HasStateAttributeCode($sObjClass)) { - $sStatusAttCode = MetaModel::GetStateAttributeCode($sObjClass); $sStateCode = $oObject->GetState(); - $sStatusLabel = $oObject->GetStateLabel(); - $sStatusColor = UIHelper::GetColorFromStatus(get_class($oObject), $sStateCode); - $oTitle->SetStatus($sStatusAttCode, $sStatusLabel, $sStatusColor); + + // Protection against classes with no default state (in which case we don't display the status) + if(!empty($sStateCode)) { + $sStatusAttCode = MetaModel::GetStateAttributeCode($sObjClass); + $sStatusLabel = $oObject->GetStateLabel(); + $sStatusColor = UIHelper::GetColorFromStatus(get_class($oObject), $sStateCode); + $oTitle->SetStatus($sStatusAttCode, $sStatusLabel, $sStatusColor); + } } return $oTitle; diff --git a/sources/application/UI/Helper/UIHelper.php b/sources/application/UI/Helper/UIHelper.php index 5c1be070d..e1b0cf533 100644 --- a/sources/application/UI/Helper/UIHelper.php +++ b/sources/application/UI/Helper/UIHelper.php @@ -10,11 +10,11 @@ namespace Combodo\iTop\Application\UI\Helper; use MetaModel; +// TODO 3.0.0: Delete this class as it is only a temporary helper while code is being reworked. class UIHelper { - public static function GetColorFromStatus(string $sClass, string $sStateCode) + public static function GetColorFromStatus(string $sClass, ?string $sStateCode): string { - $sStatusColor = 'neutral'; $sRootClass = MetaModel::GetRootClass($sClass); switch ($sRootClass) { case 'Ticket':