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

N°931: Fix History

Browse Source
This commit is contained in:
Eric
2018-09-19 09:52:06 +02:00
parent e495b36dfb
commit b734aca4d0
1 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7074,27 +7074,56 @@ class AttributeTagSet extends AttributeDBFieldVoid
{
$sResult = Dict::Format('Change:AttName_Changed', $this->GetLabel()).", ";
/** @var \ormTagSet $oOldValue */
$oOldValue = $this->MakeRealValue($sOldValue, null);
$aNewValues = explode(' ', $sNewValue);
$aOldValues = explode(' ', $sOldValue);
/** @var \ormTagSet $oNewValue */
$oNewValue = $this->MakeRealValue($sNewValue, null);
$aDelta['removed'] = array_diff($aOldValues, $aNewValues);
$aDelta['added'] = array_diff($aNewValues, $aOldValues);
$aDelta = $oOldValue->GetDeltaTags($oNewValue);
$sAdded = null;
if (isset($aDelta['added']) && !empty($aDelta['added']))
$aAllowedTags = TagSetFieldData::GetAllowedValues(MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()), $this->GetCode());
if (!empty($aDelta['added']))
{
$sAdded = $this->GenerateViewHtmlForValues($aDelta['added']);
$aAdded = array();
foreach($aDelta['added'] as $idx => $sTagCode)
{
$sTagLabel = $sTagCode;
foreach($aAllowedTags as $oTag)
{
if ($sTagCode === $oTag->Get('tag_code'))
{
$sTagLabel = $oTag->Get('tag_label');
}
}
$aAdded[] = $sTagLabel;
}
$sAdded = $this->GenerateViewHtmlForValues($aAdded);
$sResult .= Dict::Format('Change:LinkSet:Added', $sAdded);
}
if (isset($aDelta['removed']) && !empty($aDelta['removed']))
if (!empty($aDelta['removed']))
{
if (!empty($sAdded))
{
$sResult .= ', ';
}
$sRemoved = $this->GenerateViewHtmlForValues($aDelta['removed']);
$aRemoved = array();
foreach($aDelta['removed'] as $idx => $sTagCode)
{
$sTagLabel = $sTagCode;
foreach($aAllowedTags as $oTag)
{
if ($sTagCode === $oTag->Get('tag_code'))
{
$sTagLabel = $oTag->Get('tag_label');
}
}
$aRemoved[] = $sTagLabel;
}
$sRemoved = $this->GenerateViewHtmlForValues($aRemoved);
$sResult .= Dict::Format('Change:LinkSet:Removed', $sRemoved);
}