mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
Rename method to better match its usage
This commit is contained in:
@@ -2303,7 +2303,7 @@ class MenuBlock extends DisplayBlock
|
||||
// Toolkit actions
|
||||
if (!empty($aToolkitActions)) {
|
||||
foreach ($aToolkitActions as $sActionId => $aActionData) {
|
||||
$oRegularActionsMenu->AddItem('toolkit-actions', PopoverMenuItemFactory::MakeFromDisplayBlockAction($sActionId, $aActionData));
|
||||
$oRegularActionsMenu->AddItem('toolkit-actions', PopoverMenuItemFactory::MakeFromApplicationPopupMenuItemData($sActionId, $aActionData));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,7 +190,7 @@ class PopoverMenuFactory
|
||||
|
||||
$aTransformedItems = [];
|
||||
foreach($aOriginalItems as $sItemID => $aItemData) {
|
||||
$aTransformedItems[] = PopoverMenuItemFactory::MakeFromDisplayBlockAction($sItemID, $aItemData);
|
||||
$aTransformedItems[] = PopoverMenuItemFactory::MakeFromApplicationPopupMenuItemData($sItemID, $aItemData);
|
||||
}
|
||||
|
||||
return $aTransformedItems;
|
||||
@@ -265,7 +265,7 @@ class PopoverMenuFactory
|
||||
}
|
||||
|
||||
foreach ($aActions as $sActionId => $aAction) {
|
||||
$oMenu->AddItem($sSection, PopoverMenuItemFactory::MakeFromDisplayBlockAction($sActionId, $aAction));
|
||||
$oMenu->AddItem($sSection, PopoverMenuItemFactory::MakeFromApplicationPopupMenuItemData($sActionId, $aAction));
|
||||
}
|
||||
|
||||
$bFirst = false;
|
||||
|
||||
@@ -67,7 +67,7 @@ class PopoverMenuItemFactory
|
||||
}
|
||||
|
||||
/**
|
||||
* Make a PopoverMenuItem from an action prepared by \DisplayBlock
|
||||
* Make a PopoverMenuItem from an action data as return by {@see ApplicationPopupMenuItem::GetMenuItem()}
|
||||
*
|
||||
* @param string $sActionId
|
||||
* @param array $aActionData
|
||||
@@ -75,7 +75,7 @@ class PopoverMenuItemFactory
|
||||
* @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function MakeFromDisplayBlockAction(string $sActionId, array $aActionData)
|
||||
public static function MakeFromApplicationPopupMenuItemData(string $sActionId, array $aActionData)
|
||||
{
|
||||
$aRefactoredItem = [
|
||||
'uid' => $sActionId,
|
||||
|
||||
Reference in New Issue
Block a user