composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-09-29 21:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°931: TagSetData table name

Browse Source
This commit is contained in:
Eric
2018-09-19 16:07:10 +02:00
parent 055d2cc62c
commit 0252d091ca
7 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6830,15 +6830,10 @@ class AttributeTagSet extends AttributeDBFieldVoid
$aGoodTags[] = $sTagCode;
if (count($aGoodTags) === $this->GetTagMaxNb())
{
// extra tags are ignored
// extra and bad tags are ignored
continue;
}
}
else
{
// Ignore bad tags from database
IssueLog::Warning("Unknown tag $sTagCode for $sClass::$sAttCode found in database, ignored.");
}
}
$oTagSet->SetValue($aGoodTags);
@@ -7082,36 +7077,12 @@ class AttributeTagSet extends AttributeDBFieldVoid
$aAllowedTags = TagSetFieldData::GetAllowedValues(MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()), $this->GetCode());
if (!empty($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 (!empty($aDelta['removed']))
{
if (!empty($sAdded))
{
$sResult .= ', ';
}
$aRemoved = array();
foreach($aDelta['removed'] as $idx => $sTagCode)
{
if (empty($sTagCode)) {continue;}
$sTagLabel = $sTagCode;
foreach($aAllowedTags as $oTag)
{
@@ -7124,7 +7095,39 @@ class AttributeTagSet extends AttributeDBFieldVoid
}
$sRemoved = $this->GenerateViewHtmlForValues($aRemoved);
$sResult .= Dict::Format('Change:LinkSet:Removed', $sRemoved);
if (!empty($sRemoved))
{
$sResult .= Dict::Format('Change:LinkSet:Removed', $sRemoved);
}
}
if (!empty($aDelta['added']))
{
if (!empty($sRemoved))
{
$sResult .= ', ';
}
$aAdded = array();
foreach($aDelta['added'] as $idx => $sTagCode)
{
if (empty($sTagCode)) {continue;}
$sTagLabel = $sTagCode;
foreach($aAllowedTags as $oTag)
{
if ($sTagCode === $oTag->Get('tag_code'))
{
$sTagLabel = $oTag->Get('tag_label');
}
}
$aAdded[] = $sTagLabel;
}
$sAdded = $this->GenerateViewHtmlForValues($aAdded);
if (!empty($sAdded))
{
$sResult .= Dict::Format('Change:LinkSet:Added', $sAdded);
}
}
return $sResult;
@@ -7142,6 +7145,7 @@ class AttributeTagSet extends AttributeDBFieldVoid
*/
private function GenerateViewHtmlForValues($aValues, $sCssClass = 'attribute-tagset')
{
if (empty($aValues)) {return '';}
$sHtml = '<span class="'.$sCssClass.'">';
foreach($aValues as $oTag)
{