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°8764 - fix missing setup wizards titles + cache step computation

Browse Source
This commit is contained in:
odain
2026-01-22 15:54:15 +01:00
parent 985a49dc9f
commit 03e59c9749
2 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/extensionsmap.class.inc.php
View File

@@ -379,11 +379,9 @@ class iTopExtensionsMap
{
$aRes = [];
foreach ($this->GetAllExtensionsWithPreviouslyInstalled() as $oExtension) {
\IssueLog::Error($oExtension->sCode.' '.__METHOD__.__LINE__);
/** @var \iTopExtension $oExtension */
if (($oExtension->sSource !== iTopExtension::SOURCE_WIZARD) && ($oExtension->bVisible)) {
if ($bKeepMissingDependencyExtensions || (count($oExtension->aMissingDependencies) == 0)) {
if (!$oExtension->bMandatory) {
$oExtension->bMandatory = ($oExtension->sSource === iTopExtension::SOURCE_REMOTE);
}

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

@@ -1325,6 +1325,8 @@ class WizStepModulesChoice extends WizardStep
*/
protected iTopExtensionsMap $oExtensionsMap;
private ?array $aSteps = null;
protected PhpExpressionEvaluator $oPhpExpressionEvaluator;
/**
@@ -1370,15 +1372,11 @@ class WizStepModulesChoice extends WizardStep
}
}
public function GetTitle()
public function GetTitle(): string
{
if (@file_exists($this->GetSourceFilePath())) {
// Found an "installation.xml" file, let's use this definition for the wizard
return 'Extensions';
}
$aStepInfo = $this->GetStepInfo();
// No wizard configuration provided, build a standard one with just one big list. All items are mandatory, only works when there are no conflicted modules.
return 'Modules Selection';
return $aStepInfo['title'] ?? 'Modules selection';
}
public function GetPossibleSteps()
@@ -1893,51 +1891,44 @@ EOF
protected function GetStepInfo($idx = null)
{
$aStepInfo = null;
if ($idx === null) {
$index = $this->GetStepIndex();
} else {
$index = $idx;
}
$index = $idx ?? $this->GetStepIndex();
$aSteps = [];
$this->oWizard->SetParameter('additional_extensions_modules', json_encode([])); // Default value, no additional extensions
if (is_null($this->aSteps)) {
$this->aSteps = [];
$this->oWizard->SetParameter('additional_extensions_modules', json_encode([])); // Default value, no additional extensions
$aOptions = $this->oExtensionsMap->GetAllExtensionsOptionInfo();
if (@file_exists($this->GetSourceFilePath())) {
// Found an "installation.xml" file, let's use this definition for the wizard
$aParams = new XMLParameters($this->GetSourceFilePath());
$aSteps = $aParams->Get('steps', []);
$aOptions = $this->oExtensionsMap->GetAllExtensionsOptionInfo();
if (@file_exists($this->GetSourceFilePath())) {
// Found an "installation.xml" file, let's use this definition for the wizard
$aParams = new XMLParameters($this->GetSourceFilePath());
$this->aSteps = $aParams->Get('steps', []);
// Additional step for the "extensions"
$aStepDefinition = [
'title' => 'Extensions',
'description' => '<h2>Select additional extensions to install. You can launch the installation again to install new extensions or remove installed ones.</h2>',
'banner' => '/images/icons/icons8-puzzle.svg',
'options' => $aOptions,
];
// Additional step for the "extensions"
$aStepDefinition = [
'title' => 'Extensions',
'description' => '<h2>Select additional extensions to install. You can launch the installation again to install new extensions or remove installed ones.</h2>',
'banner' => '/images/icons/icons8-puzzle.svg',
'options' => $aOptions,
];
// Display this step of the wizard only if there is something to display
if (count($aStepDefinition['options']) !== 0) {
$this->oWizard->SetParameter('additional_extensions_modules', json_encode($aStepDefinition['options']));
// Display this step of the wizard only if there is something to display
if (count($aOptions) > 0) {
$this->oWizard->SetParameter('additional_extensions_modules', json_encode($aOptions));
}
} else {
// No wizard configuration provided, build a standard one with just one big list. All items are mandatory, only works when there are no conflicted modules.
$aStepDefinition = [
'title' => 'Modules Selection',
'description' => '<h2>Select the modules to install. You can launch the installation again to install new modules, but you cannot remove already installed modules.</h2>',
'banner' => '/images/icons/icons8-apps-tab.svg',
'options' => $aOptions,
];
}
} else {
// No wizard configuration provided, build a standard one with just one big list. All items are mandatory, only works when there are no conflicted modules.
$aStepDefinition = [
'title' => 'Modules Selection',
'description' => '<h2>Select the modules to install. You can launch the installation again to install new modules, but you cannot remove already installed modules.</h2>',
'banner' => '/images/icons/icons8-apps-tab.svg',
'options' => $aOptions,
];
$this->aSteps[] = $aStepDefinition;
}
$aSteps[] = $aStepDefinition;
if (array_key_exists($index, $aSteps)) {
$aStepInfo = $aSteps[$index];
}
return $aStepInfo;
return $this->aSteps[$index] ?? null;
}
public function ComputeChoiceFlags(array $aChoice, string $sChoiceId, array $aSelectedComponents, bool $bAllDisabled, bool $bDisableUninstallCheck, bool $bUpgradeMode)