composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°931: Rename Tag columns in database

Browse Source
This commit is contained in:
Eric
2018-09-20 09:58:35 +02:00
parent 3d5e46faac
commit 446bd0ad1f
10 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6797,7 +6797,7 @@ class AttributeTagSet extends AttributeDBFieldVoid
$aAllowedValues = array();
foreach($aAllowedTags as $oAllowedTag)
{
$aAllowedValues[$oAllowedTag->Get('tag_code')] = $oAllowedTag->Get('tag_label');
$aAllowedValues[$oAllowedTag->Get('code')] = $oAllowedTag->Get('label');
}
return $aAllowedValues;
@@ -7086,9 +7086,9 @@ class AttributeTagSet extends AttributeDBFieldVoid
$sTagLabel = $sTagCode;
foreach($aAllowedTags as $oTag)
{
if ($sTagCode === $oTag->Get('tag_code'))
if ($sTagCode === $oTag->Get('code'))
{
$sTagLabel = $oTag->Get('tag_label');
$sTagLabel = $oTag->Get('label');
}
}
$aRemoved[] = $sTagLabel;
@@ -7115,9 +7115,9 @@ class AttributeTagSet extends AttributeDBFieldVoid
$sTagLabel = $sTagCode;
foreach($aAllowedTags as $oTag)
{
if ($sTagCode === $oTag->Get('tag_code'))
if ($sTagCode === $oTag->Get('code'))
{
$sTagLabel = $oTag->Get('tag_label');
$sTagLabel = $oTag->Get('label');
}
}
$aAdded[] = $sTagLabel;
@@ -7153,7 +7153,7 @@ class AttributeTagSet extends AttributeDBFieldVoid
{
$sClass = MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode());
$sAttCode = $this->GetCode();
$sTagCode = $oTag->Get('tag_code');
$sTagCode = $oTag->Get('code');
$oFilter = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sTagCode'");
$oAppContext = new ApplicationContext();
$sContext = $oAppContext->GetForLink();
@@ -7161,7 +7161,7 @@ class AttributeTagSet extends AttributeDBFieldVoid
$sFilter = urlencode($oFilter->serialize());
$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
$sHtml .= '<a href="'.$sUrl.'" class="attribute-tag">'.$oTag->Get('tag_label').'</a>';
$sHtml .= '<a href="'.$sUrl.'" class="attribute-tag">'.$oTag->Get('label').'</a>';
}
else
{