composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-22 08:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9144 - fix both UI setup wizard and CLI unattended + replace production by ITOP_DEFAULT_ENV

Browse Source
This commit is contained in:
odain
2026-04-03 16:17:44 +02:00
parent d36f68e3b0
commit 82a20c54a9
25 changed files with 58 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/wizardsteps/WizStepDone.php
View File

@@ -95,7 +95,7 @@ class WizStepDone extends WizardStep
// Load the data model only, in order to load env-production/core/main.php to get the XML parameters (needed by GetModuleSettings below)
// But main.php may also contain classes (defined without any module), and thus requiring the full data model
// to be loaded to prevent "class not found" errors...
$oProductionEnv = new RunTimeEnvironment('production');
$oProductionEnv = new RunTimeEnvironment(ITOP_DEFAULT_ENV);
$oProductionEnv->InitDataModel($oConfig, true);
$sIframeUrl = $oConfig->GetModuleSetting('itop-hub-connector', 'setup_url', '');

4
setup/wizardsteps/WizStepModulesChoice.php
View File

@@ -60,8 +60,8 @@ class WizStepModulesChoice extends WizardStep
$sConfigPath = null;
if (($sPreviousSourceDir !== '') && is_readable($sPreviousSourceDir.'/conf/production/config-itop.php')) {
$sConfigPath = $sPreviousSourceDir.'/conf/production/config-itop.php';
} elseif (is_readable(utils::GetConfigFilePath('production'))) {
$sConfigPath = utils::GetConfigFilePath('production');
} elseif (is_readable(utils::GetConfigFilePath(ITOP_DEFAULT_ENV))) {
$sConfigPath = utils::GetConfigFilePath(ITOP_DEFAULT_ENV);
}
// only called if the config file exists : we are updating a previous installation !