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

N°5945 - Fix "menu" option in dashlet list having no effect since relations refactoring

Browse Source
This commit is contained in:
Molkobain
2023-06-28 10:11:51 +02:00
parent b755f65a8a
commit 3c8bea8921
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1871,7 +1871,13 @@ class MenuBlock extends DisplayBlock
/** @var array $aToolkitActions Any "legacy" toolkit menu item, which are now displayed in the same menu as the $aRegularActions, after them */ /** @var array $aToolkitActions Any "legacy" toolkit menu item, which are now displayed in the same menu as the $aRegularActions, after them */
$aToolkitActions = []; $aToolkitActions = [];
if (!isset($aExtraParams['selection_mode']) || ($aExtraParams['selection_mode'] == "")) { // Display menu actions only if...
if (
// ... NOT in a selection mode
(!isset($aExtraParams['selection_mode']) || ($aExtraParams['selection_mode'] == ""))
// ... "menu" parameter is NOT EXPLICITLY disabled
&& (!isset($aExtraParams['menu']) || $aExtraParams['menu'] === "1" || $aExtraParams['menu'] === true)
) {
$oAppContext = new ApplicationContext(); $oAppContext = new ApplicationContext();
$sContext = $oAppContext->GetForLink(); $sContext = $oAppContext->GetForLink();
if (utils::IsNotNullOrEmptyString($sContext)) { if (utils::IsNotNullOrEmptyString($sContext)) {

2
sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php
View File

@@ -43,7 +43,7 @@ class BlockIndirectLinkSetViewTable extends AbstractBlockLinkSetViewTable
'object_id' => $this->oDbObject->GetKey(), 'object_id' => $this->oDbObject->GetKey(),
'target_attr' => $this->oAttDef->GetExtKeyToRemote(), 'target_attr' => $this->oAttDef->GetExtKeyToRemote(),
'view_link' => false, 'view_link' => false,
'menu' => false, 'menu' => MetaModel::GetConfig()->Get('allow_menu_on_linkset'),
'display_limit' => true, 'display_limit' => true,
'table_id' => $this->GetTableId(), 'table_id' => $this->GetTableId(),
'zlist' => false, 'zlist' => false,