From 73f0ac4e1c9ad8a7f47d871388d2caf779b36c8f Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Mon, 25 Jan 2010 16:12:18 +0000
Subject: [PATCH] Trac#4 Improved the display of finalclass field (search
 results and graphs)

SVN:trunk[288]
---
 application/displayblock.class.inc.php | 4 ++--
 core/attributedef.class.inc.php        | 5 +++++
 core/metamodel.class.php               | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 74d9f9e23..2f07a53e9 100644
--- a/application/displayblock.class.inc.php
+++ b/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());
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index ea207937d..076453ade 100644
--- a/core/attributedef.class.inc.php
+++ b/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);
+	}
 }
 
 /**
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 28a5fcce6..1725daaab 100644
--- a/core/metamodel.class.php
+++ b/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,