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

MenuBlock: Put ID prefix in a class constant to be able to reuse it

Browse Source
This commit is contained in:
Molkobain
2021-04-20 16:29:40 +02:00
parent 370a07f596
commit d1ccd5c8eb
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1772,6 +1772,13 @@ EOF
*/
class MenuBlock extends DisplayBlock
{
/**
* @var string Prefix to use for the ID of the actions toolbar
* @used-by static::GetRenderContent
* @since 3.0.0
*/
public const ACTIONS_TOOLBAR_ID_PREFIX = 'ibo-actions-toolbar-';
/**
* Renders the "Actions" popup menu for the given set of objects
*
@@ -2146,7 +2153,10 @@ class MenuBlock extends DisplayBlock
break;
}
$oRenderBlock->AddSubBlock(utils::GetPopupMenuItemsBlock($iMenuId, $param, $aRegularActions, $sId));
$oPopupMenuItemsBlock = utils::GetPopupMenuItemsBlock($iMenuId, $param, $aRegularActions, $sId);
if($oPopupMenuItemsBlock->HasSubBlocks()) {
$oRenderBlock->AddSubBlock($oPopupMenuItemsBlock);
}
// Extract favorite actions from their menus
$aFavoriteRegularActions = [];
@@ -2169,7 +2179,7 @@ class MenuBlock extends DisplayBlock
}
}
$oActionsToolbar = ToolbarUIBlockFactory::MakeForAction("ibo-actions-toolbar-{$sId}");
$oActionsToolbar = ToolbarUIBlockFactory::MakeForAction(static::ACTIONS_TOOLBAR_ID_PREFIX.$sId);
$oRenderBlock->AddSubBlock($oActionsToolbar);
$sRegularActionsMenuTogglerId = "ibo-regular-actions-menu-toggler-{$sId}";
$sRegularActionsPopoverMenuId = "ibo-regular-actions-popover-{$sId}";