diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index c990a4743..4f7247aaf 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -1400,18 +1400,22 @@ class WizStepModulesChoice extends WizardStep
$aExtensionsAdded = [];
$aExtensionsRemoved = [];
+ $aExtensionsNotUninstallable = [];
foreach ($this->oExtensionsMap->GetAllExtensionsWithPreviouslyInstalled() as $oExtension) {
/* @var \iTopExtension $oExtension */
$bSelected = in_array($oExtension->sCode, $aExtensions);
if($oExtension->bInstalled && !$bSelected){
- $aExtensionsRemoved[] = $oExtension->sLabel;
+ $aExtensionsRemoved[$oExtension->sCode] = $oExtension->sLabel;
}
else if(!$oExtension->bInstalled && $bSelected) {
- $aExtensionsAdded[] = $oExtension->sLabel;
+ $aExtensionsAdded[$oExtension->sCode] = $oExtension->sLabel;
+ }
+ if(!$oExtension->CanBeUninstalled()){
+ $aExtensionsNotUninstallable[$oExtension->sCode] = true;
}
}
- $sExtensionsAdded = 'No extension added.';
+ $sExtensionsAdded = '
';
if (count($aExtensionsAdded) > 0) {
$sExtensionsAdded = '';
foreach ($aExtensionsAdded as $sExtensionCode) {
@@ -1420,16 +1424,19 @@ class WizStepModulesChoice extends WizardStep
$sExtensionsAdded .= '
';
}
- $sExtensionsRemoved = 'No extension removed.';
+ $sExtensionsRemoved = '';
if (count($aExtensionsRemoved) > 0) {
$sExtensionsRemoved = '';
- foreach ($aExtensionsRemoved as $sExtensionCode) {
- $sExtensionsRemoved .= '- '.$sExtensionCode.'
';
+ foreach ($aExtensionsRemoved as $sCode => $sExtensionCode) {
+ $sForcedUninstall = '';
+ if (isset($aExtensionsNotUninstallable[$sCode])) {
+ $sForcedUninstall = ' (forced uninstallation)';
+ }
+ $sExtensionsRemoved .= '- '.$sExtensionCode.$sForcedUninstall.'
';
}
$sExtensionsRemoved .= '
';
}
-
$this->oWizard->SetParameter('selected_modules', json_encode(array_keys($aModules)));
$this->oWizard->SetParameter('selected_extensions', json_encode($aExtensions));
$this->oWizard->SetParameter('display_choices', $sDisplayChoices);
@@ -2253,10 +2260,10 @@ class WizStepSummary extends WizardStep
$oPage->add('