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

#473 Could not load NW interfaces (reconciliation issue)

Browse Source 
SVN:trunk[1581]
This commit is contained in:
Romain Quetiez
2011-09-19 10:36:47 +00:00
parent abd645ca98
commit cac76a7e08
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,7 @@ abstract class AttributeDefinition
public function IsNullAllowed() {return true;}
public function GetCode() {return $this->m_sCode;}
public function GetLabel()
public function GetLabel($sDefault = '')
{
$sLabel = Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode, '');
if (strlen($sLabel) == 0)
@@ -192,9 +192,14 @@ abstract class AttributeDefinition
if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
{
$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
$sLabel = $oAttDef->GetLabel();
$sLabel = $oAttDef->GetLabel($sDefault);
}
}
else
{
// Nothing defined in the class hierarchy: return the default value
$sLabel = $sDefault;
}
}
return $sLabel;
}
@@ -212,7 +217,7 @@ abstract class AttributeDefinition
}
}
public function GetDescription()
public function GetDescription($sDefault = '')
{
$sDescription = Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode.'+', '');
if (strlen($sDescription) == 0)
@@ -223,14 +228,19 @@ abstract class AttributeDefinition
if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
{
$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
$sDescription = $oAttDef->GetDescription();
$sDescription = $oAttDef->GetDescription($sDefault);
}
}
else
{
// Nothing defined in the class hierarchy: return the default value
$sDescription = $sDefault;
}
}
return $sDescription;
}
public function GetHelpOnEdition()
public function GetHelpOnEdition($sDefault = '')
{
$sHelp = Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode.'?', '');
if (strlen($sHelp) == 0)
@@ -241,9 +251,14 @@ abstract class AttributeDefinition
if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
{
$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
$sHelp = $oAttDef->GetHelpOnEdition();
$sHelp = $oAttDef->GetHelpOnEdition($sDefault);
}
}
else
{
// Nothing defined in the class hierarchy: return the default value
$sHelp = $sDefault;
}
}
return $sHelp;
}
@@ -2718,19 +2733,19 @@ class AttributeExternalField extends AttributeDefinition
{
$oRemoteAtt = $this->GetExtAttDef();
$sDefault = $oRemoteAtt->GetLabel();
return Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode, $sDefault);
return parent::GetLabel($sDefault);
}
public function GetDescription()
{
$oRemoteAtt = $this->GetExtAttDef();
$sDefault = $oRemoteAtt->GetDescription();
return Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode.'+', $sDefault);
return parent::GetDescription($sDefault);
}
public function GetHelpOnEdition()
{
$oRemoteAtt = $this->GetExtAttDef();
$sDefault = $oRemoteAtt->GetHelpOnEdition();
return Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode.'?', $sDefault);
return parent::GetHelpOnEdition($sDefault);
}
public function IsExternalKey($iType = EXTKEY_RELATIVE)