composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 06:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°931: TagSet - Support for removed tags in history

Browse Source
This commit is contained in:
Eric
2018-08-30 12:42:56 +02:00
parent f458a77449
commit 3250e0a1e6
4 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
core/attributedef.class.inc.php
View File

@@ -6045,15 +6045,16 @@ class AttributeTagSet extends AttributeDBFieldVoid
throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
}
/**
* @param $value
* @param \DBObject $oHostObject
* @param bool $bLocalize
*
* @return string|null
*
* @throws \CoreException
*/
/**
* @param $value
* @param \DBObject $oHostObject
* @param bool $bLocalize
*
* @return string|null
*
* @throws \CoreException
* @throws \Exception
*/
public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
{
if ($value instanceof ormTagSet)
@@ -6074,8 +6075,41 @@ class AttributeTagSet extends AttributeDBFieldVoid
}
if (is_string($value))
{
$oValue = $this->MakeRealValue($value, $oHostObject);
return $this->GetAsHTML($oValue, $oHostObject, $bLocalize);
try
{
$oValue = $this->MakeRealValue($value, $oHostObject);
return $this->GetAsHTML($oValue, $oHostObject, $bLocalize);
}
catch (Exception $e)
{
// unknown tags are present display the code instead
}
$aTagCodes = explode(' ', $value);
$aValues = array();
$oTagSet = new ormTagSet(MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()), $this->GetCode());
foreach ($aTagCodes as $sTagCode)
{
try
{
$oTagSet->AddTag($sTagCode);
}
catch (Exception $e)
{
$aValues[] = $sTagCode;
}
}
$sHTML = '';
if (!empty($aValues))
{
$sHTML .= '<span class="attribute-tagset-undefined">'.implode('</span><span class="attribute-tagset-undefined">', $aValues).'</span>';
}
$aValues = $oTagSet->GetLabel();
if (!empty($aValues))
{
$sHTML .= '<span class="attribute-tagset">'.implode('</span><span class="attribute-tagset">', $aValues).'</span>';
}
return $sHTML;
}
return parent::GetAsHTML($value, $oHostObject, $bLocalize);

1
core/ormtagset.class.inc.php
View File

@@ -149,6 +149,7 @@ final class ormTagSet
public function GetLabel()
{
$aLabels = array();
$aValues = array();
foreach ($this->aPreserved as $oTag)
{
try

9
css/light-grey.css
View File

@@ -2870,3 +2870,12 @@ table.listResults .originColor {
margin-right: 3px;
border-radius: 4px;
}
.attribute-tagset-undefined {
color: grey;
font-style: italic;
display: inline-block;
padding: 3px;
background-color: lightgrey;
margin-right: 3px;
border-radius: 4px;
}

10
css/light-grey.scss
View File

@@ -3268,4 +3268,14 @@ table.listResults .originColor{
color: white;
margin-right: 3px;
border-radius: 4px;
}
.attribute-tagset-undefined{
color: grey;
font-style: italic;
display: inline-block;
padding: 3px;
background-color: lightgrey;
margin-right: 3px;
border-radius: 4px;
}