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

#194 Fixed regression in DBObjectSet -due to the new feature "queries returning several objects"

Browse Source 
SVN:trunk[636]
This commit is contained in:
Romain Quetiez
2010-07-28 14:38:41 +00:00
parent 1fb9af95b5
commit d9c208236b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/dbobjectset.class.php
View File

@@ -273,15 +273,14 @@ class DBObjectSet
public function AddObject($oObject, $sClassAlias = '')
{
$sObjClass = get_class($oObject);
if (strlen($sClassAlias) == 0)
{
$sClassAlias = $sObjClass;
$sClassAlias = $this->m_oFilter->GetClassAlias();
}
$iNextPos = count($this->m_aData);
$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
$this->m_aId2Row[$sObjClass][$oObject->GetKey()] = $iNextPos;
$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
}
protected function AddObjectExtended($aObjectArray)
@@ -291,7 +290,7 @@ class DBObjectSet
foreach ($aObjectArray as $sClassAlias => $oObject)
{
$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
$this->m_aId2Row[get_class($oObject)][$oObject->GetKey()] = $iNextPos;
$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
}
}
@@ -329,10 +328,11 @@ class DBObjectSet
$oNewSet = DBObjectSet::FromScratch($this->GetClass());
$sClassAlias = $this->m_oFilter->GetClassAlias();
$oObjectSet->Seek(0);
while ($oObject = $oObjectSet->Fetch())
{
if (array_key_exists($oObject->GetKey(), $this->m_aId2Row))
if (array_key_exists($oObject->GetKey(), $this->m_aId2Row[$sClassAlias]))
{
$oNewSet->AddObject($oObject);
}
@@ -350,10 +350,11 @@ class DBObjectSet
$oNewSet = DBObjectSet::FromScratch($this->GetClass());
$sClassAlias = $this->m_oFilter->GetClassAlias();
$oObjectSet->Seek(0);
while ($oObject = $oObjectSet->Fetch())
{
if (!array_key_exists($oObject->GetKey(), $this->m_aId2Row))
if (!array_key_exists($oObject->GetKey(), $this->m_aId2Row[$sClassAlias]))
{
$oNewSet->AddObject($oObject);
}