Trac#4 Improved the display of finalclass field (search results and graphs)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@288 a333f486-631f-4898-b8df-5754b55c2be0

application/displayblock.class.inc.php

@@ -298,7 +298,7 @@ class DisplayBlock
 				$aGroupBy = array();
 				while($oObj = $this->m_oSet->Fetch())
 				{
-					$sValue = $oObj->Get($sGroupByField);
+					$sValue = $oObj->GetAsHtml($sGroupByField);
 					$aGroupBy[$sValue] = isset($aGroupBy[$sValue]) ? $aGroupBy[$sValue]+1 : 1;
 				}
 				$sFilter = urlencode($this->m_oFilter->serialize());
@@ -552,7 +552,7 @@ class DisplayBlock
 					$aGroupBy = array();
 					while($oObj = $this->m_oSet->Fetch())
 					{
-						$sValue = $oObj->Get($sGroupByField);
+						$sValue = $oObj->GetAsHtml($sGroupByField);
 						$aGroupBy[$sValue] = isset($aGroupBy[$sValue]) ? $aGroupBy[$sValue]+1 : 1;
 					}
 					$sFilter = urlencode($this->m_oFilter->serialize());

core/attributedef.class.inc.php

@@ -623,6 +623,11 @@ class AttributeClass extends AttributeString
 		$aParams["allowed_values"] = new ValueSetEnumClasses($aParams['class_category'], $aParams['more_values']);
 		parent::__construct($sCode, $aParams);
 	}
+
+	public function GetAsHTML($sValue)
+	{
+		return MetaModel::GetName($sValue);
+	}
 }
 
 /**

core/metamodel.class.php

@@ -832,10 +832,11 @@ abstract class MetaModel
 				$sClassAttCode = 'finalclass';
 				$sRootClass = self::GetRootClass($sClass);
 				$sDbFinalClassField = self::DBGetClassField($sRootClass);
-				$oClassAtt = new AttributeString($sClassAttCode, array(
+				$oClassAtt = new AttributeClass($sClassAttCode, array(
 						"label"=>"Class",
 						"description"=>"Real (final) object class",
-						"allowed_values"=>null,
+						"class_category"=>null,
+						"more_values"=>'',
 						"sql"=>$sDbFinalClassField,
 						"default_value"=>$sClass,
 						"is_null_allowed"=>false,