diff --git a/css/backoffice/layout/object/_object-details.scss b/css/backoffice/layout/object/_object-details.scss index 6845e17e7..9e0338919 100644 --- a/css/backoffice/layout/object/_object-details.scss +++ b/css/backoffice/layout/object/_object-details.scss @@ -28,7 +28,7 @@ $ibo-object-details--tag--separator--diameter: 5px !default; $ibo-object-details--tag--separator--margin-right: 12px !default; $ibo-object-details--tag--separator--border-radius: $ibo-border-radius-full !default; -/* Parent block overloads (!= than blocks integrations */ +/* Parent block overloads (!= than blocks integrations) */ .ibo-object-details { &.ibo-has-icon.ibo-has-medallion-icon { // Note: Direct child selector is mandatory, otherwise a panel within a panel with a medallion icon will have its icon as a medallion too (eg. dashboard in an object) @@ -84,13 +84,6 @@ $ibo-object-details--tag--separator--border-radius: $ibo-border-radius-full !def } } -@each $sType, $aColors in $ibo-lifecycle-states-colors { - .ibo-object-details--status-dot.ibo-is-state-#{$sType} { - color: map-get($aColors, 'secondary-color'); - background-color: map-get($aColors, 'primary-color'); - } -} - .ibo-object-details--tag { color: $ibo-object-details--tag--color; diff --git a/sources/application/UI/Base/Layout/Object/ObjectDetails.php b/sources/application/UI/Base/Layout/Object/ObjectDetails.php index 2c00085e9..481d7bb48 100644 --- a/sources/application/UI/Base/Layout/Object/ObjectDetails.php +++ b/sources/application/UI/Base/Layout/Object/ObjectDetails.php @@ -59,9 +59,9 @@ class ObjectDetails extends Panel implements iKeyboardShortcut protected $sObjectMode; /** @var string */ protected $sIconUrl; - /** @var string */ + /** @var string Code of the current value of the attribute carrying the state for $sClassName */ protected $sStatusCode; - /** @var string */ + /** @var string Label of the current value of the attribute carrying the state for $sClassName */ protected $sStatusLabel; /** @var string */ protected $sStatusColor; @@ -223,18 +223,21 @@ class ObjectDetails extends Panel implements iKeyboardShortcut } /** - * @param \DBObject $oObject * @see static::$oObject * + * @param \DBObject $oObject + * * @throws \ArchivedObjectException - * @throws \CoreException + * @throws \CoreException*@throws \Exception */ protected function ComputeState(DBObject $oObject): void { if (MetaModel::HasStateAttributeCode($this->sClassName)) { $this->sStatusCode = $oObject->GetState(); $this->sStatusLabel = $oObject->GetStateLabel(); - $this->sStatusColor = UIHelper::GetColorFromStatus($this->sClassName, $this->sStatusCode); + + $oStyle = MetaModel::GetEnumStyle($this->sClassName, MetaModel::GetStateAttributeCode($this->sClassName), $this->sStatusCode); + $this->sStatusColor = $oStyle->GetMainColor(); } } diff --git a/templates/base/layouts/object/object-details/layout.html.twig b/templates/base/layouts/object/object-details/layout.html.twig index fdc677a1b..c07a4af8c 100644 --- a/templates/base/layouts/object/object-details/layout.html.twig +++ b/templates/base/layouts/object/object-details/layout.html.twig @@ -12,7 +12,7 @@ {% block iboPanelSubTitle %} {% if oUIBlock.GetStatusLabel() is not empty %} - + {{ oUIBlock.GetStatusLabel() }} {% endif %}