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

N°8864 Passing array instead of html

Browse Source
This commit is contained in:
Timothee
2026-01-06 14:29:23 +01:00
parent 1c45a4c49e
commit 7844c9ffd0
2 changed files with 53 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
setup/wizardsteps.class.inc.php
View File

@@ -1386,32 +1386,7 @@ class WizStepModulesChoice extends WizardStep
} }
} }
$sExtensionsAdded = ''; return [$aExtensionsAdded, $aExtensionsRemoved, $aExtensionsNotUninstallable];
if (count($aExtensionsAdded) > 0) {
$sExtensionsAdded = '<ul>';
foreach ($aExtensionsAdded as $sExtensionCode) {
$sExtensionsAdded .= '<li>'.$sExtensionCode.'</li>';
}
$sExtensionsAdded .= '</ul>';
} else {
$sExtensionsAdded = '<ul><li>No extension added.</li></ul>';
}
$sExtensionsRemoved = '';
if (count($aExtensionsRemoved) > 0) {
$sExtensionsRemoved = '<ul>';
foreach ($aExtensionsRemoved as $sCode => $sExtensionCode) {
$sForcedUninstall = '';
if (isset($aExtensionsNotUninstallable[$sCode])) {
$sForcedUninstall = ' (forced uninstallation)';
}
$sExtensionsRemoved .= '<li>'.$sExtensionCode.$sForcedUninstall.'</li>';
}
$sExtensionsRemoved .= '</ul>';
} else {
$sExtensionsRemoved = '<ul><li>No extension removed.</li></ul>';
}
return [$sExtensionsAdded, $sExtensionsRemoved];
} }
public function ProcessParams($bMoveForward = true) public function ProcessParams($bMoveForward = true)
@@ -1444,13 +1419,13 @@ class WizStepModulesChoice extends WizardStep
$this->oWizard->SetParameter('old_addon', true); $this->oWizard->SetParameter('old_addon', true);
} }
[$sExtensionsAdded, $sExtensionsRemoved] = $this->GetAddedAndRemovedExtensions($aExtensions); [$aExtensionsAdded, $aExtensionsRemoved, $aExtensionsNotUninstallable] = $this->GetAddedAndRemovedExtensions($aExtensions);
$this->oWizard->SetParameter('selected_modules', json_encode(array_keys($aModules))); $this->oWizard->SetParameter('selected_modules', json_encode(array_keys($aModules)));
$this->oWizard->SetParameter('selected_extensions', json_encode($aExtensions)); $this->oWizard->SetParameter('selected_extensions', json_encode($aExtensions));
$this->oWizard->SetParameter('display_choices', $sDisplayChoices); $this->oWizard->SetParameter('display_choices', $sDisplayChoices);
$this->oWizard->SetParameter('extensions_added', $sExtensionsAdded); $this->oWizard->SetParameter('extensions_added', json_encode($aExtensionsAdded));
$this->oWizard->SetParameter('extensions_removed', $sExtensionsRemoved); $this->oWizard->SetParameter('extensions_removed', json_encode($aExtensionsRemoved));
$this->oWizard->SetParameter('extensions_not_uninstallable', json_encode(array_keys($aExtensionsNotUninstallable)));
return ['class' => 'WizStepSummary', 'state' => '']; return ['class' => 'WizStepSummary', 'state' => ''];
} }
@@ -2270,10 +2245,39 @@ class WizStepSummary extends WizardStep
$oPage->add('<div id="params_summary">'); $oPage->add('<div id="params_summary">');
$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions to be installed</span>'); $oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions to be installed</span>');
$oPage->add($this->oWizard->GetParameter('extensions_added')); $aExtensionsAdded = json_decode($this->oWizard->GetParameter('extensions_added'), true);
$sExtensionsAdded = '';
if (count($aExtensionsAdded)) {
$sExtensionsAdded = '<ul>';
foreach ($aExtensionsAdded as $sExtensionCode => $sLabel) {
$sExtensionsAdded .= '<li>'.$sLabel.'</li>';
}
$sExtensionsAdded .= '</ul>';
} else {
$sExtensionsAdded = '<ul><li>No extension added.</li></ul>';
}
$oPage->add($sExtensionsAdded);
$oPage->add('</div>'); $oPage->add('</div>');
$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions to be uninstalled</span>'); $oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions to be uninstalled</span>');
$oPage->add($this->oWizard->GetParameter('extensions_removed'));
$aExtensionsRemoved = json_decode($this->oWizard->GetParameter('extensions_removed'), true);
$aExtensionsNotUninstallable = json_decode($this->oWizard->GetParameter('extensions_not_uninstallable'));
$sExtensionsRemoved = '';
if (count($aExtensionsRemoved) > 0) {
$sExtensionsRemoved = '<ul>';
foreach ($aExtensionsRemoved as $sExtensionCode => $sLabel) {
$sForcedUninstall = '';
if (in_array($sExtensionCode, $aExtensionsNotUninstallable)) {
$sForcedUninstall = ' (forced uninstallation)';
}
$sExtensionsRemoved .= '<li>'.$sLabel.$sForcedUninstall.'</li>';
}
$sExtensionsRemoved .= '</ul>';
} else {
$sExtensionsRemoved = '<ul><li>No extension removed.</li></ul>';
}
$oPage->add($sExtensionsRemoved);
$oPage->add('</div>'); $oPage->add('</div>');
$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Database Parameters</span><ul>'); $oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Database Parameters</span><ul>');

44
tests/php-unit-tests/unitary-tests/setup/WizStepModulesChoiceTest.php
View File

@@ -272,28 +272,18 @@ class WizStepModulesChoiceTest extends ItopTestCase
'aExtensionsOnDiskOrDb' => [], 'aExtensionsOnDiskOrDb' => [],
'aSelected' => [], 'aSelected' => [],
'sExpectedAddedList' => '<ul><li>No extension added.</li></ul>', 'aExpectedAddedList' => [],
'sExpectedRemovedList' => '<ul><li>No extension removed.</li></ul>', 'aExpectedRemovedList' => [],
], ],
'no extensions selected' => [ 'no extensions added nor removed' => [
'aExtensionsOnDiskOrDb' => [ 'aExtensionsOnDiskOrDb' => [
'itop-ext1' => [ 'itop-ext1' => [
'installed' => false, 'installed' => false,
], ],
], ],
'aSelected' => [], 'aSelected' => [],
'sExpectedAddedList' => '<ul><li>No extension added.</li></ul>', 'aExpectedAddedList' => [],
'sExpectedRemovedList' => '<ul><li>No extension removed.</li></ul>', 'aExpectedRemovedList' => [],
],
'no extensions removed' => [
'aExtensionsOnDiskOrDb' => [
'itop-ext1' => [
'installed' => true,
],
],
'aSelected' => ['itop-ext1'],
'sExpectedAddedList' => '<ul><li>No extension added.</li></ul>',
'sExpectedRemovedList' => '<ul><li>No extension removed.</li></ul>',
], ],
'One added extension' => [ 'One added extension' => [
'aExtensionsOnDiskOrDb' => [ 'aExtensionsOnDiskOrDb' => [
@@ -302,8 +292,8 @@ class WizStepModulesChoiceTest extends ItopTestCase
], ],
], ],
'aSelected' => ['itop-ext1'], 'aSelected' => ['itop-ext1'],
'sExpectedAddedList' => '<ul><li>itop-ext1</li></ul>', 'aExpectedAddedList' => ['itop-ext1' => 'itop-ext1'],
'sExpectedRemovedList' => '<ul><li>No extension removed.</li></ul>', 'aExpectedRemovedList' => [],
], ],
'One removed extension' => [ 'One removed extension' => [
'aExtensionsOnDiskOrDb' => [ 'aExtensionsOnDiskOrDb' => [
@@ -312,8 +302,8 @@ class WizStepModulesChoiceTest extends ItopTestCase
], ],
], ],
'aSelected' => [], 'aSelected' => [],
'sExpectedAddedList' => '<ul><li>No extension added.</li></ul>', 'aExpectedAddedList' => [],
'sExpectedRemovedList' => '<ul><li>itop-ext1</li></ul>', 'aExpectedRemovedList' => ['itop-ext1' => 'itop-ext1'],
], ],
'Forced removed extension' => [ 'Forced removed extension' => [
'aExtensionsOnDiskOrDb' => [ 'aExtensionsOnDiskOrDb' => [
@@ -323,8 +313,8 @@ class WizStepModulesChoiceTest extends ItopTestCase
], ],
], ],
'aSelected' => [], 'aSelected' => [],
'sExpectedAddedList' => '<ul><li>No extension added.</li></ul>', 'aExpectedAddedList' => [],
'sExpectedRemovedList' => '<ul><li>itop-ext1 (forced uninstallation)</li></ul>', 'aExpectedRemovedList' => ['itop-ext1' => 'itop-ext1'],
], ],
'added and removed extensions' => [ 'added and removed extensions' => [
'aExtensionsOnDiskOrDb' => [ 'aExtensionsOnDiskOrDb' => [
@@ -342,8 +332,8 @@ class WizStepModulesChoiceTest extends ItopTestCase
], ],
], ],
'aSelected' => ['itop-ext-added1', 'itop-ext-added2'], 'aSelected' => ['itop-ext-added1', 'itop-ext-added2'],
'sExpectedAddedList' => '<ul><li>itop-ext-added1</li><li>itop-ext-added2</li></ul>', 'aExpectedAddedList' => ['itop-ext-added1' => 'itop-ext-added1', 'itop-ext-added2' => 'itop-ext-added2'],
'sExpectedRemovedList' => '<ul><li>itop-ext-removed1</li><li>itop-ext-removed2</li></ul>', 'aExpectedRemovedList' => ['itop-ext-removed1' => 'itop-ext-removed1', 'itop-ext-removed2' => 'itop-ext-removed2'],
], ],
]; ];
@@ -352,12 +342,12 @@ class WizStepModulesChoiceTest extends ItopTestCase
/** /**
* @dataProvider ProviderGetAddedAndRemovedExtensions * @dataProvider ProviderGetAddedAndRemovedExtensions
*/ */
public function testGetAddedAndRemovedExtensions($aExtensionsOnDiskOrDb, $aSelectedExtensions, $sExpectedAddedList, $sExpectedRemovedList) public function testGetAddedAndRemovedExtensions($aExtensionsOnDiskOrDb, $aSelectedExtensions, $aExpectedAddedList, $aExpectedRemovedList)
{ {
$this->oStep->setExtensionMap(iTopExtensionsMapFake::createFromArray($aExtensionsOnDiskOrDb)); $this->oStep->setExtensionMap(iTopExtensionsMapFake::createFromArray($aExtensionsOnDiskOrDb));
[$sAddedList, $sRemovedList] = $this->oStep->GetAddedAndRemovedExtensions($aSelectedExtensions); [$aAddedList, $aRemovedList, $aNotUninstallableList] = $this->oStep->GetAddedAndRemovedExtensions($aSelectedExtensions);
$this->assertEquals($sExpectedAddedList, $sAddedList); $this->assertEquals($aExpectedAddedList, $aAddedList);
$this->assertEquals($sExpectedRemovedList, $sRemovedList); $this->assertEquals($aExpectedRemovedList, $aRemovedList);
} }
} }