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

N°9009 - fix removing sources of a mandatory module

Browse Source
This commit is contained in:
Eric Espie
2026-04-30 12:03:38 +02:00
parent c4eaeeeb5f
commit da282e6c24
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/wizardsteps/WizStepModulesChoice.php
View File

@@ -478,6 +478,7 @@ EOF
* @param string $sParentId Used for recursion
*
* @return string A text representation of what will be installed
* @throws \Exception
*/
public function GetSelectedModules($aInfo, $aSelectedChoices, &$aModules, $sParentId = '', $sDisplayChoices = '', &$aSelectedExtensions = null)
{
@@ -507,8 +508,8 @@ EOF
(isset($aSelectedChoices[$sChoiceId]) && ($aSelectedChoices[$sChoiceId] == $sChoiceId))) {
$sDisplayChoices .= '<li>'.$aChoice['title'].'</li>';
if (isset($aChoice['modules'])) {
if (count($aChoice['modules']) === 0) {
//throw new Exception('Extension '.$aChoice['extension_code'].' does not have any module associated');
if (count($aChoice['modules']) === 0 && (!isset($aChoice['missing']) || $aChoice['missing'] === false)) {
throw new Exception('Extension '.$aChoice['extension_code'].' does not have any module associated');
}
foreach ($aChoice['modules'] as $sModuleId) {
$bSelected = true;

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

@@ -2,15 +2,13 @@
namespace Combodo\iTop\Test\UnitTest\Integration;
use Combodo\iTop\Application\WebPage\WebPage;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use iTopExtension;
use iTopExtensionsMap;
use iTopExtensionsMapFake;
use ModuleDiscovery;
use WepPageFake;
use WizardController;
use WizStepModulesChoiceFake;
use WepPageFake;
use XMLParameters;
class WizStepModulesChoiceTest extends ItopTestCase
@@ -930,6 +928,40 @@ class WizStepModulesChoiceTest extends ItopTestCase
$this->oStep->GetSelectedModules($aStepInfo, ['_0' => '_0'], $aModules, '', '', $aExtensions);
}
public function testGetSelectedModulesShouldNotThrowAnExceptionWhenAMandatoryModuleIsMissing()
{
$aExtensionsMapData = [];
$this->oStep->setExtensionMap(iTopExtensionsMapFake::createFromArray($aExtensionsMapData));
//GetSelectedModules
$aStepInfo = [
'title' => 'Extensions',
'description' => '',
'banner' => '',
'options' => [
[
'extension_code' => 'combodo-sample',
'title' => 'Sample extension',
'description' => '',
'more_info' => '',
'default' => true,
'modules' => [],
'mandatory' => true,
'source_label' => '',
'uninstallable' => true,
'missing' => true,
],
],
];
$aModules = [];
$aExtensions = [];
$this->oStep->GetSelectedModules($aStepInfo, ['_0' => '_0'], $aModules, '', '', $aExtensions);
$this->assertCount(0, $aModules);
$this->assertCount(1, $aExtensions);
}
public function ProviderDisplayOptions()
{
return [