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

Merge branch 'support/3.3-beta1' into develop

Browse Source
This commit is contained in:
lenaick.moreira
2026-07-17 17:05:46 +02:00
parent 109fdfa06b 85d50f31bd
commit 041437cbeb
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/wizardsteps/WizStepModulesChoice.php
View File

@@ -750,7 +750,7 @@ EOF
$bSelected = isset($aSelectedComponents[$sChoiceId]) && ($aSelectedComponents[$sChoiceId] === $sChoiceId);
$bMissingFromDisk = isset($aChoice['missing']) && $aChoice['missing'] === true;
$bMandatory = (isset($aChoice['mandatory']) && $aChoice['mandatory']);
$bInstalled = $bMissingFromDisk || $oITopExtension->bInstalled;
$bInstalled = $bMissingFromDisk || $oITopExtension?->bInstalled ?? false;
$bDependencyIssue = $oITopExtension?->HasDependencyIssue() ?? false;
$bChecked = $bSelected;

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

@@ -78,9 +78,6 @@ class WizStepModulesChoiceTest extends ItopTestCase
],
'A missing extension should be disabled and unchecked' => [
'aExtensionsOnDiskOrDb' => [
'itop-ext1' => [
'installed' => false,
],
],
'aWizardStepDefinition' => [
'extension_code' => 'itop-ext1',
@@ -102,9 +99,6 @@ class WizStepModulesChoiceTest extends ItopTestCase
],
'A missing extension should always be disabled and unchecked, even when mandatory' => [
'aExtensionsOnDiskOrDb' => [
'itop-ext1' => [
'installed' => false,
],
],
'aWizardStepDefinition' => [
'extension_code' => 'itop-ext1',
@@ -126,9 +120,6 @@ class WizStepModulesChoiceTest extends ItopTestCase
],
'A missing extension should always be disabled and unchecked, even when non-uninstallable' => [
'aExtensionsOnDiskOrDb' => [
'itop-ext1' => [
'installed' => false,
],
],
'aWizardStepDefinition' => [
'extension_code' => 'itop-ext1',