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

N°931: TagSetFieldData Fix bad name extract

Browse Source
This commit is contained in:
Eric
2018-09-18 12:17:27 +02:00
parent 9fbd27f3a8
commit 70840c53aa
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,9 +103,11 @@ abstract class TagSetFieldData extends cmdbAbstractObject
/**
* Extract Tag class and attcode from the TagFieldData class name
*
* @param $sClassName
*
* @return string[]
* @throws \CoreException
*/
public static function ExtractTagFieldName($sClassName)
{
@@ -116,6 +118,10 @@ abstract class TagSetFieldData extends cmdbAbstractObject
$aRes['tag_class'] = $aMatches['class'];
$aRes['tag_attcode'] = $aMatches['attcode'];
}
else
{
throw new CoreException("Bad Class name format: $sClassName");
}
return $aRes;
}
@@ -250,7 +256,13 @@ abstract class TagSetFieldData extends cmdbAbstractObject
public static function GetClassName($sClass)
{
$aTagFieldInfo = TagSetFieldData::ExtractTagFieldName($sClass);
try
{
$aTagFieldInfo = TagSetFieldData::ExtractTagFieldName($sClass);
} catch (CoreException $e)
{
return $sClass;
}
$sClassDesc = MetaModel::GetName($aTagFieldInfo['tag_class']);
$sAttDesc = MetaModel::GetAttributeDef($aTagFieldInfo['tag_class'], $aTagFieldInfo['tag_attcode'])->GetLabel();
if (Dict::Exists("Class:$sClass"))