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

Toolkit: deharcoded source directory

Browse Source 
SVN:trunk[2234]
This commit is contained in:
Romain Quetiez
2012-10-05 12:02:05 +00:00
parent 5b93504709
commit 60cf926fdb
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/utils.inc.php
View File

@@ -792,9 +792,13 @@ class utils
/**
* Get target configuration file name (including full path)
*/
public static function GetConfigFilePath()
public static function GetConfigFilePath($sEnvironment = null)
{
return APPCONF.self::GetCurrentEnvironment().'/'.ITOP_CONFIG_FILE;
if (is_null($sEnvironment))
{
$sEnvironment = self::GetCurrentEnvironment();
}
return APPCONF.$sEnvironment.'/'.ITOP_CONFIG_FILE;
}
/**

7
setup/runtimeenv.class.inc.php
View File

@@ -304,8 +304,13 @@ class RunTimeEnvironment
return $aRet;
}
public function CompileFrom($sSourceEnv, $sSourceDir = 'datamodel')
public function CompileFrom($sSourceEnv, $sSourceDir = null)
{
if (is_null($sSourceDir))
{
$oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv));
$sSourceDir = $oSourceConfig->Get('source_dir');
}
$sSourceDirFull = APPROOT.$sSourceDir;
// Do load the required modules
//