diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index eaecea798..3e322bd9a 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -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)); } } } diff --git a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php index e1ac39dec..5bb458132 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php @@ -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; diff --git a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php index d8692b9d5..b228ea6ca 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php @@ -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,