composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 - Fix crash when object with state attribute has no state defined

Browse Source
This commit is contained in:
Molkobain
2020-11-10 15:55:20 +01:00
parent 38fbc49e51
commit 77ecd055b4
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/application/UI/Component/Title/TitleFactory.php
View File

@@ -53,11 +53,15 @@ class TitleFactory
} }
if (MetaModel::HasStateAttributeCode($sObjClass)) { if (MetaModel::HasStateAttributeCode($sObjClass)) {
$sStatusAttCode = MetaModel::GetStateAttributeCode($sObjClass);
$sStateCode = $oObject->GetState(); $sStateCode = $oObject->GetState();
$sStatusLabel = $oObject->GetStateLabel();
$sStatusColor = UIHelper::GetColorFromStatus(get_class($oObject), $sStateCode); // Protection against classes with no default state (in which case we don't display the status)
$oTitle->SetStatus($sStatusAttCode, $sStatusLabel, $sStatusColor); if(!empty($sStateCode)) {
$sStatusAttCode = MetaModel::GetStateAttributeCode($sObjClass);
$sStatusLabel = $oObject->GetStateLabel();
$sStatusColor = UIHelper::GetColorFromStatus(get_class($oObject), $sStateCode);
$oTitle->SetStatus($sStatusAttCode, $sStatusLabel, $sStatusColor);
}
} }
return $oTitle; return $oTitle;

4
sources/application/UI/Helper/UIHelper.php
View File

@@ -10,11 +10,11 @@ namespace Combodo\iTop\Application\UI\Helper;
use MetaModel; use MetaModel;
// TODO 3.0.0: Delete this class as it is only a temporary helper while code is being reworked.
class UIHelper 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); $sRootClass = MetaModel::GetRootClass($sClass);
switch ($sRootClass) { switch ($sRootClass) {
case 'Ticket': case 'Ticket':