composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-25 11:38:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue on deletion: was not recursive, leading to data integrity issues

Browse Source 
SVN:trunk[815]
This commit is contained in:
Romain Quetiez
2010-09-10 18:49:48 +00:00
parent f120e21e00
commit dfb1ae83c7
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/dbobject.class.php
View File

@@ -1245,11 +1245,22 @@ abstract class DBObject
return $aDependentObjects;
}
public function GetDeletionScheme()
/**
* $aDeletedObjs = array(); // [class][key] => structure
* $aResetedObjs = array(); // [class][key] => object
*/
public function GetDeletionScheme(&$aDeletedObjs, &$aResetedObjs, $aVisited = array())
{
if (array_key_exists(get_class($this), $aVisited))
{
if (in_array($this->GetKey(), $aVisited[get_class($this)]))
{
return;
}
}
$aVisited[get_class($this)] = $this->GetKey();
$aDependentObjects = $this->GetReferencingObjects();
$aDeletedObjs = array(); // [class][key] => structure
$aResetedObjs = array(); // [class][key] => object
foreach ($aDependentObjects as $sRemoteClass => $aPotentialDeletes)
{
foreach ($aPotentialDeletes as $sRemoteExtKey => $aData)
@@ -1292,13 +1303,17 @@ abstract class DBObject
// First time we find the given object in the list
// (and most likely case is that no other occurence will be found)
$aDeletedObjs[$sRemoteClass][$iId]['to_delete'] = $oDependentObj;
$aDeletedObjs[$sRemoteClass][$iId]['auto_delete'] = ($iDeletePropagationOption == DEL_AUTO);
$aDeletedObjs[$sRemoteClass][$iId]['auto_delete'] = ($iDeletePropagationOption == DEL_AUTO);
// Recursively inspect this object
if ($iDeletePropagationOption == DEL_AUTO)
{
$oDependentObj->GetDeletionScheme($aDeletedObjs, $aResetedObjs, $aVisited);
}
}
}
}
}
}
return array($aDeletedObjs, $aResetedObjs);
}
}

6
pages/UI.php
View File

@@ -38,8 +38,10 @@ function DeleteObjects(WebPage $oP, $sClass, $aObjects, $bDeleteConfirmed)
{
// Evaluate the impact on the DB integrity
//
list ($aDeletedObjs, $aResetedObjs) = $oObj->GetDeletionScheme();
$aDeletedObjs = array();
$aResetedObjs = array();
$oObj->GetDeletionScheme($aDeletedObjs, $aResetedObjs);
// Evaluate feasibility (user access control)
//
foreach ($aDeletedObjs as $sRemoteClass => $aDeletes)