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

In case of no leaf class to remove, delete also the child classes

Browse Source
This commit is contained in:
Eric Espie
2026-03-10 10:10:39 +01:00
parent 9fb06bc00a
commit c4ba1564ec
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datamodels/2.x/combodo-data-feature-removal/src/Service/DeletionPlanService.php
View File

@@ -2,6 +2,7 @@
namespace Combodo\iTop\DataFeatureRemoval\Service; namespace Combodo\iTop\DataFeatureRemoval\Service;
use CMDBSource;
use Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanSummaryEntity; use Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanSummaryEntity;
use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException; use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException;
use DBObjectSearch; use DBObjectSearch;
@@ -139,7 +140,6 @@ class DeletionPlanService
foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef) { foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef) {
$oToUpdate->Set($sRemoteExtKey, 0); $oToUpdate->Set($sRemoteExtKey, 0);
$oToUpdate->DBUpdate(); $oToUpdate->DBUpdate();
$oDeletionPlanSummaryEntity->iUpdateCount++; $oDeletionPlanSummaryEntity->iUpdateCount++;
} }
} }
@@ -158,10 +158,11 @@ class DeletionPlanService
MetaModel::PurgeData($oFilter); MetaModel::PurgeData($oFilter);
// Delete the entry // Delete the entry
foreach (\MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, false) as $sParentClass) { $aClassesToRemove = array_merge(MetaModel::EnumChildClasses($sClass, ENUM_PARENT_CLASSES_ALL), MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_EXCLUDELEAF, false));
$oFilter = \DBObjectSearch::FromOQL_AllData("SELECT $sParentClass WHERE id=:id"); foreach ($aClassesToRemove as $sParentClass) {
$oFilter = DBObjectSearch::FromOQL_AllData("SELECT $sParentClass WHERE id=:id");
$sQuery = $oFilter->MakeDeleteQuery(['id' => $sId]); $sQuery = $oFilter->MakeDeleteQuery(['id' => $sId]);
\CMDBSource::DeleteFrom($sQuery); CMDBSource::DeleteFrom($sQuery);
} }
$oDeletionPlanSummaryEntity->iDeleteCount++; $oDeletionPlanSummaryEntity->iDeleteCount++;