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

Compiler: added the auto_load option + fixed issue with parent menu declared in another module

Browse Source 
SVN:trunk[1949]
This commit is contained in:
Romain Quetiez
2012-04-06 15:09:18 +00:00
parent da2abef030
commit a7b7264903
13 changed files with 71 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,16 +171,29 @@ EOF;
EOF;
file_put_contents($sResultFile, $sMenusHeader, FILE_APPEND);
// Preliminary: determine parent menus not defined within the current module
$aMenusToLoad = array();
foreach($oMenus as $oMenu)
{
if ($oParent = $this->GetOptionalElement($oMenu, 'parent'))
{
$aMenusToLoad[] = $oParent->GetAttribute('value');
}
// Note: the order matters: the parents must be defined BEFORE
$aMenusToLoad[] = $oMenu->GetAttribute('id');
}
$aMenusToLoad = array_unique($aMenusToLoad);
foreach($aMenusToLoad as $sMenuId)
{
$oMenu = $this->oFactory->GetMenu($sMenuId);
try
{
$this->CompileMenu($oMenu, $sResultFile, $sRelativeDir, $oP);
}
catch (ssDOMFormatException $e)
{
$sClass = $oClass->getAttribute("name");
throw new Exception("Failed to process class '$sClass', from '$sModuleRootDir': ".$e->getMessage());
$sMenu = $oMenu->getAttribute("name");
throw new Exception("Failed to process menu '$sMenu', from '$sModuleRootDir': ".$e->getMessage());
}
}
}
@@ -868,20 +881,33 @@ EOF;
$sNewMenu = "new MenuGroup('$sMenuId', $fRank);";
}
}
$sIndent = ' ';
$sPHPMenu = "\$__comp_menus__['$sMenuId'] = $sNewMenu";
$sIndent = '';
$aPHPMenu = array("\$__comp_menus__['$sMenuId'] = $sNewMenu");
if ($oAutoReload = $this->GetOptionalElement($oMenu, 'auto_reload'))
{
$sAutoReload = addslashes($oAutoReload->GetAttribute("value"));
$aPHPMenu[] = "\$__comp_menus__['$sMenuId']->SetParameters(array('auto_reload' => '$sAutoReload'));";
}
$oAdminOnly = $this->GetOptionalElement($oMenu, 'enable_admin_only');
if ($oAdminOnly && $oAdminOnly->GetAttribute('value') == '1')
{
$sPHP = $sIndent."if (UserRights::IsAdministrator())\n";
$sPHP .= $sIndent."{\n";
$sPHP .= $sIndent." $sPHPMenu\n";
foreach($aPHPMenu as $sPHPLine)
{
$sPHP .= $sIndent." $sPHPLine\n";
}
$sPHP .= $sIndent."}\n";
}
else
{
$sPHP = $sIndent."$sPHPMenu\n";
$sPHP = '';
foreach($aPHPMenu as $sPHPLine)
{
$sPHP .= $sIndent.$sPHPLine."\n";
}
}
file_put_contents($sResFile, $sPHP, FILE_APPEND);

25
setup/modelfactory.class.inc.php
View File

@@ -1159,6 +1159,31 @@ EOF
return $this->_priv_GetNodes($sXPath, $this->oMenus);
}
/**
* Get a menu, given its is id
* @param string $sModuleName
* @param bool $bFlattenLayers
* @throws Exception
*/
public function GetMenu($sMenuId, $bFlattenLayers = true)
{
if (!array_key_exists($sMenuId, self::$aLoadedMenus))
{
return null;
}
$oMenuNode = self::$aLoadedMenus[$sMenuId];
if ($bFlattenLayers)
{
$sOperation = $oMenuNode->getAttribute('_operation');
if ($sOperation == 'removed')
{
$oMenuNode = null;
}
}
return $oMenuNode;
}
public function ApplyChanges()
{
$oNodes = $this->ListChanges();