mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-20 15:52:24 +02:00
N°9567 - Extension Mgmt : Run setup (fix post-deletion button inputs)
This commit is contained in:
@@ -108,7 +108,7 @@ class DataFeatureRemovalController extends Controller
|
|||||||
SetupUtils::EraseSetupToken();
|
SetupUtils::EraseSetupToken();
|
||||||
} else {
|
} else {
|
||||||
//from same module
|
//from same module
|
||||||
//$this->ValidateTransactionId();
|
$this->ValidateTransactionId();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Display changed extensions
|
// Display changed extensions
|
||||||
@@ -233,40 +233,6 @@ class DataFeatureRemovalController extends Controller
|
|||||||
return [$this->GetTableData($sName, $aColumns, $aRows), $iQueryCount, !$bHasIssues];
|
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
|
public function OperationDoDeletion(): void
|
||||||
{
|
{
|
||||||
$this->ValidateTransactionId();
|
$this->ValidateTransactionId();
|
||||||
|
|||||||
@@ -26,6 +26,9 @@
|
|||||||
{% for sCode, sLabel in aRemovedExtensions %}
|
{% for sCode, sLabel in aRemovedExtensions %}
|
||||||
{% UIInput ForHidden { sName:"aRemovedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
|
{% UIInput ForHidden { sName:"aRemovedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
{% for sInputName, sValue in aHiddenInputs %}
|
||||||
|
{% UIInput ForHidden { sName:sInputName, sValue:sValue } %}
|
||||||
|
{% endfor %}
|
||||||
{% UIToolbar ForButton {} %}
|
{% UIToolbar ForButton {} %}
|
||||||
{% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
|
{% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
|
||||||
{% EndUIToolbar %}
|
{% EndUIToolbar %}
|
||||||
|
|||||||
Reference in New Issue
Block a user