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

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

Browse Source 
SVN:trunk[288]
This commit is contained in:
Romain Quetiez
2010-01-25 16:12:18 +00:00
parent f6b572ebcd
commit 73f0ac4e1c
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/displayblock.class.inc.php
View File

@@ -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());

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

@@ -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);
}
}
/**

5
core/metamodel.class.php
View File

@@ -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,