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

Reviewed ModelFactory and the compiler

Browse Source 
SVN:trunk[1971]
This commit is contained in:
Romain Quetiez
2012-04-24 16:06:11 +00:00
parent 0dfbc28577
commit f9d5b88c06
2 changed files with 35 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
setup/compiler.class.inc.php
View File

@@ -57,6 +57,19 @@ class MFCompiler
$oP = new CompilerEchoPage();
}
$aMenuNodes = array();
$aMenusByModule = array();
foreach ($this->oFactory->ListActiveChildNodes('menus', 'menu') as $oMenuNode)
{
$sMenuId = $oMenuNode->getAttribute('id');
$aMenuNodes[$sMenuId] = $oMenuNode;
$sModuleMenu = $oMenuNode->getAttribute('_created_in');
$aMenusByModule[$sModuleMenu][] = $sMenuId;
}
$aResultFiles = array();
$aModules = $this->oFactory->GetLoadedModules();
@@ -153,9 +166,7 @@ EOF;
}
}
$oMenus = $this->oFactory->ListMenus($sModuleName);
$iMenuCount = $oMenus->length;
if ($iMenuCount == 0)
if (!array_key_exists($sModuleName, $aMenusByModule))
{
$oP->p("Found module without menus declared: $sModuleName");
}
@@ -172,27 +183,28 @@ EOF;
// Preliminary: determine parent menus not defined within the current module
$aMenusToLoad = array();
foreach($oMenus as $oMenu)
foreach($aMenusByModule[$sModuleName] as $sMenuId)
{
if ($sParent = $oMenu->GetChildText('parent', null))
$oMenuNode = $aMenuNodes[$sMenuId];
if ($sParent = $oMenuNode->GetChildText('parent', null))
{
$aMenusToLoad[] = $sParent;
}
// Note: the order matters: the parents must be defined BEFORE
$aMenusToLoad[] = $oMenu->GetAttribute('id');
$aMenusToLoad[] = $sMenuId;
}
$aMenusToLoad = array_unique($aMenusToLoad);
foreach($aMenusToLoad as $sMenuId)
{
$oMenu = $this->oFactory->GetMenu($sMenuId);
$oMenuNode = $aMenuNodes[$sMenuId];
try
{
$this->CompileMenu($oMenu, $sResultFile, $sRelativeDir, $oP);
$this->CompileMenu($oMenuNode, $sResultFile, $sRelativeDir, $oP);
}
catch (ssDOMFormatException $e)
{
$sMenu = $oMenu->getAttribute("id");
throw new Exception("Failed to process menu '$sMenu', from '$sModuleRootDir': ".$e->getMessage());
throw new Exception("Failed to process menu '$sMenuId', from '$sModuleRootDir': ".$e->getMessage());
}
}
}