From 52bc9fcf147e9a86d5c85ca1e08ab272a4c46782 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Tue, 19 May 2026 15:23:12 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B09567=20-=20Extension=20Mgmt=20:=20Run=20?= =?UTF-8?q?setup=20(fix=20post-deletion=20button=20inputs)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataFeatureRemovalController.php | 36 +------------------ .../templates/AnalysisResult.html.twig | 3 ++ 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php index 395f3c8b31..d43775713f 100644 --- a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php +++ b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php @@ -108,7 +108,7 @@ class DataFeatureRemovalController extends Controller SetupUtils::EraseSetupToken(); } else { //from same module - //$this->ValidateTransactionId(); + $this->ValidateTransactionId(); } // Display changed extensions @@ -233,40 +233,6 @@ class DataFeatureRemovalController extends Controller return [$this->GetTableData($sName, $aColumns, $aRows), $iQueryCount, !$bHasIssues]; } - public function OperationDeletionPlan(): void - { - $aParams = []; - $this->ValidateTransactionId(); - - $aClasses = utils::ReadPostedParam('classes', null, utils::ENUM_SANITIZATION_FILTER_CLASS); - - $oDataCleanupService = new DataCleanupService(); - $aDeletionPlanSummaryEntities = $oDataCleanupService->GetCleanupSummary($aClasses); - $aColumns = ['Class', 'DeleteCount' , 'UpdateCount', 'IssueCount']; - $aRows = []; - $iQueryCount = 0; - $bHasIssues = false; - foreach ($aDeletionPlanSummaryEntities as $oDeletionPlanSummaryEntity) { - $aRows[] = [ - $oDeletionPlanSummaryEntity->sClass, - $oDeletionPlanSummaryEntity->iDeleteCount, - $oDeletionPlanSummaryEntity->iUpdateCount, - $oDeletionPlanSummaryEntity->iIssueCount, - ]; - $bHasIssues |= ($oDeletionPlanSummaryEntity->iIssueCount !== 0); - $iQueryCount += $oDeletionPlanSummaryEntity->iDeleteCount; - $iQueryCount += $oDeletionPlanSummaryEntity->iUpdateCount; - } - - $aParams['sTransactionId'] = utils::GetNewTransactionId(); - $aParams['aDeletionPlanSummary'] = $this->GetTableData('Extensions', $aColumns, $aRows); - $aParams['aClasses'] = $aClasses; - $aParams['iQueryCount'] = $iQueryCount; - $aParams['bDeletionPossible'] = !$bHasIssues; - - $this->DisplayPage($aParams); - } - public function OperationDoDeletion(): void { $this->ValidateTransactionId(); diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig index 66871f0ce5..e585003983 100644 --- a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig +++ b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig @@ -26,6 +26,9 @@ {% for sCode, sLabel in aRemovedExtensions %} {% UIInput ForHidden { sName:"aRemovedExtensions[" ~ sCode ~ "]", sValue:sLabel } %} {% endfor %} + {% for sInputName, sValue in aHiddenInputs %} + {% UIInput ForHidden { sName:sInputName, sValue:sValue } %} + {% endfor %} {% UIToolbar ForButton {} %} {% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %} {% EndUIToolbar %}