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: Fix search when referencing a non existing tag

Browse Source
This commit is contained in:
Eric
2018-09-20 10:31:02 +02:00
parent 446bd0ad1f
commit cf07c9f1a2
2 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6725,6 +6725,43 @@ class AttributeTagSet extends AttributeDBFieldVoid
return $this->Get("is_null_allowed");
}
/**
* Extract all existing tags from a string and ignore bad tags
*
* @param $sValue
*
* @return \ormTagSet
* @throws \CoreException
* @throws \CoreUnexpectedValue
*/
public function GetExistingTagsFromString($sValue)
{
$aTagCodes = explode(' ', "$sValue");
$sAttCode = $this->GetCode();
$sClass = MetaModel::GetAttributeOrigin($this->GetHostClass(), $sAttCode);
$oTagSet = new ormTagSet($sClass, $sAttCode, $this->GetTagMaxNb());
$aGoodTags = array();
foreach($aTagCodes as $sTagCode)
{
if ($sTagCode === '')
{
continue;
}
if ($oTagSet->IsValidTag($sTagCode))
{
$aGoodTags[] = $sTagCode;
if (count($aGoodTags) === $this->GetTagMaxNb())
{
// extra and bad tags are ignored
continue;
}
}
}
$oTagSet->SetValue($aGoodTags);
return $oTagSet;
}
public function GetTagMaxNb()
{
return $this->Get('tag_max_nb');
@@ -6814,30 +6851,8 @@ class AttributeTagSet extends AttributeDBFieldVoid
public function FromSQLToValue($aCols, $sPrefix = '')
{
$sValue = $aCols["$sPrefix"];
$aTagCodes = explode(' ', "$sValue");
$sAttCode = $this->GetCode();
$sClass = MetaModel::GetAttributeOrigin($this->GetHostClass(), $sAttCode);
$oTagSet = new ormTagSet($sClass, $sAttCode, $this->GetTagMaxNb());
$aGoodTags = array();
foreach($aTagCodes as $sTagCode)
{
if ($sTagCode === '')
{
continue;
}
if ($oTagSet->IsValidTag($sTagCode))
{
$aGoodTags[] = $sTagCode;
if (count($aGoodTags) === $this->GetTagMaxNb())
{
// extra and bad tags are ignored
continue;
}
}
}
$oTagSet->SetValue($aGoodTags);
return $oTagSet;
return $this->GetExistingTagsFromString($sValue);
}
/**
@@ -6851,8 +6866,7 @@ class AttributeTagSet extends AttributeDBFieldVoid
*/
public function MakeRealValue($proposedValue, $oHostObj)
{
$oTagSet = new ormTagSet(MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()),
$this->GetCode(), $this->GetTagMaxNb());
$oTagSet = new ormTagSet(MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()), $this->GetCode(), $this->GetTagMaxNb());
if (is_string($proposedValue) && !empty($proposedValue))
{
$aTagCodes = explode(' ', "$proposedValue");
@@ -6879,10 +6893,8 @@ class AttributeTagSet extends AttributeDBFieldVoid
* @return mixed null if no match could be found
* @throws \Exception
*/
public function MakeValueFromString(
$sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null,
$sAttributeQualifier = null
) {
public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
{
if (is_null($sSepItem) || empty($sSepItem))
{
$sSepItem = MetaModel::GetConfig()->Get('tag_set_item_separator');
@@ -6939,7 +6951,7 @@ class AttributeTagSet extends AttributeDBFieldVoid
}
if (is_string($sValue))
{
$sValue = $this->MakeRealValue($sValue, null);
$sValue = $this->GetExistingTagsFromString($sValue);
}
if ($sValue instanceof ormTagSet)
{