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

N°3203 - Datamodel: Add semantic for image & state attributes Part. II

Browse Source
This commit is contained in:
Molkobain
2020-11-09 15:41:42 +01:00
parent 63d52787f0
commit f2ff5a4e83
28 changed files with 371 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php
View File

@@ -45,7 +45,7 @@ class CMDBChangeOpSetAttributeScalarFactory extends CMDBChangeOpSetAttributeFact
$sAttCode = $oChangeOp->Get('attcode');
// Specific ActivityEntry for transition, otherwise just a regular EditsEntry
if($sAttCode === MetaModel::GetStateAttributeCode($sHostObjectClass))
if(MetaModel::HasLifecycle($sHostObjectClass) && ($sAttCode === MetaModel::GetStateAttributeCode($sHostObjectClass)))
{
$oDateTime = DateTime::createFromFormat(AttributeDateTime::GetInternalFormat(), $oChangeOp->Get('date'));

3
sources/application/UI/Layout/Object/ObjectDetails.php
View File

@@ -48,8 +48,7 @@ class ObjectDetails extends Panel
$this->sName = $oObject->GetRawName();
$this->sIconUrl = $oObject->GetIcon(false);
$sStatusAttCode = MetaModel::GetStateAttributeCode($this->sClassName);
if(!empty($sStatusAttCode)) {
if(MetaModel::HasStateAttributeCode($this->sClassName)) {
$this->sStatusCode = $oObject->GetState();
$this->sStatusLabel = $oObject->GetStateLabel();
$this->sStatusColor = UIHelper::GetColorFromStatus($this->sClassName, $this->sStatusCode);