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

Enhancement: support injection of new modules treated as data.

Browse Source 
SVN:trunk[3525]
This commit is contained in:
Denis Flaven
2015-04-01 15:53:05 +00:00
parent 328a5e8077
commit 030b4fa380
12 changed files with 265 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup/setuputils.class.inc.php
View File

@@ -1123,12 +1123,31 @@ EOF
{
$aDirsToScan[] = APPROOT.'extensions';
}
if (is_dir(APPROOT.'data'))
{
$aDirsToScan[] = APPROOT.'extensions';
}
if (is_dir($oWizard->GetParameter('copy_extensions_from')))
{
$aDirsToScan[] = $oWizard->GetParameter('copy_extensions_from');
}
$sExtraDir = APPROOT.'data/production-modules/';
if (is_dir($sExtraDir))
{
$aDirsToScan[] = $sExtraDir;
}
$oProductionEnv = new RunTimeEnvironment();
$aAvailableModules = $oProductionEnv->AnalyzeInstallation($oConfig, $aDirsToScan, $bAbortOnMissingDependency, $aModulesToLoad);
foreach($aAvailableModules as $key => $aModule)
{
$bIsExtra = (array_key_exists('root_dir', $aModule) && (strpos($aModule['root_dir'], $sExtraDir) !== false)); // Some modules (root, datamodel) have no 'root_dir'
if ($bIsExtra)
{
// Modules in data/production-modules/ are considered as mandatory and always installed
$aAvailableModules[$key]['visible'] = false;
}
}
return $aAvailableModules;
}