From d8905c63b80a29d5b816380cb957a51e9fd78087 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Fri, 12 Mar 2010 16:58:50 +0000
Subject: [PATCH] Fixed bug in DisplayBlock (group by - visible on the page
 "contacts overview")

SVN:trunk[317]
---
 application/displayblock.class.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 90ddbbcad..9a961d4a4 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -296,10 +296,12 @@ class DisplayBlock
 			{
 				$sGroupByField = $aExtraParams['group_by'];
 				$aGroupBy = array();
+				$sLabels = array();
 				while($oObj = $this->m_oSet->Fetch())
 				{
-					$sValue = $oObj->GetAsHtml($sGroupByField);
+					$sValue = $oObj->Get($sGroupByField);
 					$aGroupBy[$sValue] = isset($aGroupBy[$sValue]) ? $aGroupBy[$sValue]+1 : 1;
+					$sLabels[$sValue] = $oObj->GetAsHtml($sGroupByField);
 				}
 				$sFilter = urlencode($this->m_oFilter->serialize());
 				$aData = array();
@@ -307,7 +309,7 @@ class DisplayBlock
 				$sParams = $oAppContext->GetForLink();
 				foreach($aGroupBy as $sValue => $iCount)
 				{
-					$aData[] = array ( 'group' => $sValue,
+					$aData[] = array ( 'group' => $sLabels[$sValue],
 									  'value' => "<a href=\"./UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter&$sGroupByField=".urlencode($sValue)."\">$iCount</a>"); // TO DO: add the context information
 				}
 				$sHtml .= $oPage->GetTable(array('group' => array('label' => MetaModel::GetLabel($this->m_oFilter->GetClass(), $sGroupByField), 'description' => ''), 'value' => array('label'=>'Count', 'description' => 'Number of elements')), $aData);