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

- Align the display of "State" attributes with Enums

Browse Source 
SVN:trunk[555]
This commit is contained in:
Denis Flaven
2010-07-05 12:47:12 +00:00
parent 2d454141e6
commit de0d719942
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -951,8 +951,9 @@ class AttributeEnum extends AttributeString
public function GetAsHTML($sValue)
{
$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue, $sValue);
$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', $sValue);
// later, we could imagine a detailed description in the title
return "<span title=\"\">".parent::GetAsHtml($sLabel)."</span>";
return "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
}
public function GetEditValue($sValue)

1
core/dbobject.class.php
View File

@@ -524,7 +524,6 @@ abstract class DBObject
else
{
return $this->Get($sStateAttCode);
return MetaModel::GetStateLabel(get_class($this), $sStateAttCode);
}
}

4
core/metamodel.class.php
View File

@@ -811,7 +811,9 @@ abstract class MetaModel
public static function GetStateLabel($sClass, $sStateValue)
{
$sStateAttrCode = self::GetStateAttributeCode($sClass);
return Dict::S("Class:$sClass/Attribute:$sStateAttrCode/Value:$sStateValue", $sStateValue);
$oAttDef = self::GetAttributeDef($sClass, $sStateAttrCode);
// Be consistent with what is done for enums, since states are defined as enums...
return Dict::S("Class:".$oAttDef->GetHostClass()."/Attribute:$sStateAttrCode/Value:$sStateValue");
// I've decided the current implementation, because I need
// to get the description as well -GetAllowedValues does not render the description,