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

N°3917 Fix object details icon cover method when using class highlight icon as object icon

Browse Source
This commit is contained in:
Stephen Abello
2021-09-28 16:24:17 +02:00
parent a7a7ce77fb
commit aac504ec0b
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/dbobject.class.php
View File

@@ -1470,23 +1470,15 @@ abstract class DBObject implements iDisplay
*/
public function GetIcon($bImgTag = true)
{
$sCode = $this->ComputeHighlightCode();
$sClass = get_class($this);
if($sCode != '')
{
$aHighlightScale = MetaModel::GetHighlightScale($sClass);
if (array_key_exists($sCode, $aHighlightScale))
{
$sIconUrl = $aHighlightScale[$sCode]['icon'];
if($bImgTag)
{
return "<img src=\"$sIconUrl\" style=\"vertical-align:middle\"/>";
}
else
{
return $sIconUrl;
}
if($this->HasHighlightIcon()) {
$sIconUrl = MetaModel::GetHighlightScale($sClass)[$this->ComputeHighlightCode()]['icon'];
if($bImgTag) {
return "<img src=\"$sIconUrl\" style=\"vertical-align:middle\"/>";
}
else {
return $sIconUrl;
}
}
@@ -1527,6 +1519,31 @@ abstract class DBObject implements iDisplay
return $bHasInstanceIcon;
}
/**
* @return bool True if the class has an highlight icon declared for the current object state
* @throws \ArchivedObjectException
* @throws \CoreException
* @since 3.0.0
*/
public function HasHighlightIcon(): bool
{
$bHasHighlightIcon = false;
$sCode = $this->ComputeHighlightCode();
$sClass = get_class($this);
if($sCode != '')
{
$aHighlightScale = MetaModel::GetHighlightScale($sClass);
if (array_key_exists($sCode, $aHighlightScale))
{
$bHasHighlightIcon = true;
}
}
return $bHasHighlightIcon;
}
/**
* Get the label of a class
*

2
sources/application/UI/Base/Layout/Object/ObjectDetails.php
View File

@@ -204,7 +204,7 @@ class ObjectDetails extends Panel implements iKeyboardShortcut
// Default icon is the class icon
$sIconUrl = $oObject->GetIcon(false);
// Note: Class icons are a square image with no margin around, so they need to be zoomed out in the medallion
$sIconCoverMethod = $oObject->HasInstanceIcon() ? static::ENUM_ICON_COVER_METHOD_COVER : static::ENUM_ICON_COVER_METHOD_ZOOMOUT;
$sIconCoverMethod = $oObject->HasInstanceIcon() && !$oObject->HasHighlightIcon() ? static::ENUM_ICON_COVER_METHOD_COVER : static::ENUM_ICON_COVER_METHOD_ZOOMOUT;
$this->SetIcon($sIconUrl, $sIconCoverMethod, true);
}