composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32: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

6
datamodels/2.x/itop-core-update/src/Controller/AjaxController.php
View File

@@ -246,10 +246,10 @@ class AjaxController extends Controller
$iResponseCode = 200;
try {
$aParams['sAjaxURL'] = utils::GetAbsoluteUrlAppRoot().'/pages/UI.php';
$oConfig = new Config(APPCONF.'production'.'/'.ITOP_CONFIG_FILE);
$oEnvironment = new RunTimeEnvironment('production');
$oConfig = new Config(APPCONF.ITOP_DEFAULT_ENV.'/'.ITOP_CONFIG_FILE);
$oEnvironment = new RunTimeEnvironment(ITOP_DEFAULT_ENV);
$oEnvironment->WriteConfigFileSafe($oConfig);
$oEnvironment->CompileFrom('production');
$oEnvironment->CompileFrom(ITOP_DEFAULT_ENV);
} catch (Exception $e) {
IssueLog::Error('RebuildToolkitEnvironment: '.$e->getMessage());
$aParams['sError'] = $e->getMessage();

8
datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php
View File

@@ -89,7 +89,7 @@ final class CoreUpdater
// Compile code
SetupLog::Info('itop-core-update: Start checking compilation');
$sFinalEnv = 'production';
$sFinalEnv = ITOP_DEFAULT_ENV;
$oRuntimeEnv = new RunTimeEnvironmentCoreUpdater($sFinalEnv, false);
$oRuntimeEnv->CheckDirectories($sFinalEnv);
$oRuntimeEnv->CompileFrom($sFinalEnv);
@@ -117,10 +117,10 @@ final class CoreUpdater
// Compile code
SetupLog::Info('itop-core-update: Start compilation');
$sFinalEnv = 'production';
$sFinalEnv = ITOP_DEFAULT_ENV;
$oRuntimeEnv = new RunTimeEnvironmentCoreUpdater($sFinalEnv, true);
$oRuntimeEnv->CheckDirectories($sFinalEnv);
$oRuntimeEnv->CompileFrom('production');
$oRuntimeEnv->CompileFrom(ITOP_DEFAULT_ENV);
SetupLog::Info('itop-core-update: Compilation done');
} catch (Exception $e) {
@@ -142,7 +142,7 @@ final class CoreUpdater
try {
SetupLog::Info('itop-core-update: Start Update database');
$sFinalEnv = 'production';
$sFinalEnv = ITOP_DEFAULT_ENV;
$oRuntimeEnv = new RunTimeEnvironmentCoreUpdater($sFinalEnv, true);
$oConfig = $oRuntimeEnv->MakeConfigFile($sFinalEnv.' (built on '.date('Y-m-d').')');
$oConfig->Set('access_mode', ACCESS_FULL);

4
datamodels/2.x/itop-core-update/src/Service/RunTimeEnvironmentCoreUpdater.php
View File

@@ -25,7 +25,7 @@ class RunTimeEnvironmentCoreUpdater extends RunTimeEnvironment
*
* @throws \Exception
*/
public function __construct($sEnvironment = 'production', $bAutoCommit = true)
public function __construct($sEnvironment = ITOP_DEFAULT_ENV, $bAutoCommit = true)
{
parent::__construct($sEnvironment, $bAutoCommit);
@@ -83,7 +83,7 @@ class RunTimeEnvironmentCoreUpdater extends RunTimeEnvironment
{
// Clone the default 'production' config file
//
$oConfig = clone($this->GetConfig('production'));
$oConfig = clone($this->GetConfig(ITOP_DEFAULT_ENV));
$oConfig->UpdateIncludes('env-'.$this->sBuildEnv);