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

Fixed regression (shortcut actions, display a list of objects not deriving from cmdbAbstract)

Browse Source 
SVN:trunk[1510]
This commit is contained in:
Romain Quetiez
2011-08-25 09:29:52 +00:00
parent 6e4e5be35d
commit 71655f0632
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/displayblock.class.inc.php
View File

@@ -1229,15 +1229,22 @@ class MenuBlock extends DisplayBlock
}
$aFavoriteActions = array();
$aCallSpec = array($sClass, 'GetShortcutActions');
$aShortcutActions = call_user_func($aCallSpec, $sClass);
foreach ($aActions as $key => $aAction)
if (is_callable($aCallSpec))
{
if (in_array($key, $aShortcutActions))
$aShortcutActions = call_user_func($aCallSpec, $sClass);
foreach ($aActions as $key => $aAction)
{
$aFavoriteActions[] = $aAction;
unset($aActions[$key]);
if (in_array($key, $aShortcutActions))
{
$aFavoriteActions[] = $aAction;
unset($aActions[$key]);
}
}
}
else
{
$aShortcutActions = array();
}
if (count($aFavoriteActions) > 0)
{