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

Merge remote-tracking branch 'origin/support/3.1' into develop

Browse Source
This commit is contained in:
Molkobain
2023-10-31 14:01:53 +01:00
parent 893efa8e2d 83313ce1d5
commit 3027bb5092
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2042,7 +2042,7 @@ class MenuBlock extends DisplayBlock
} }
//---------------------------------------------------- //----------------------------------------------------
// Any style but NOT "listInObject" (linksets) actions // Any style but NOT \DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT (linksets) actions
//---------------------------------------------------- //----------------------------------------------------
if ($this->m_sStyle !== static::ENUM_STYLE_LIST_IN_OBJECT) { if ($this->m_sStyle !== static::ENUM_STYLE_LIST_IN_OBJECT) {
switch ($iSetCount) { switch ($iSetCount) {

3
sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
View File

@@ -25,6 +25,7 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
use Combodo\iTop\Controller\AjaxRenderController; use Combodo\iTop\Controller\AjaxRenderController;
use DBObjectSet; use DBObjectSet;
use Dict; use Dict;
use DisplayBlock;
use MenuBlock; use MenuBlock;
use MetaModel; use MetaModel;
use UserRights; use UserRights;
@@ -100,7 +101,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$oDataTable->AddOption('printVersion', true); $oDataTable->AddOption('printVersion', true);
} }
return self::RenderDataTable($oDataTable, 'listInObject', $oPage, $sListId, $oSet, $aExtraParams); return self::RenderDataTable($oDataTable, DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT, $oPage, $sListId, $oSet, $aExtraParams);
} }
/** /**

2
sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php
View File

@@ -196,7 +196,7 @@ abstract class AbstractBlockLinkSetViewTable extends UIContentBlock
$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData()); $oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
// add list block // add list block
$oBlock = new DisplayBlock($oLinkSet->GetFilter(), 'listInObject', false); $oBlock = new DisplayBlock($oLinkSet->GetFilter(), DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT, false);
$this->AddSubBlock($oBlock->GetRenderContent($oPage, $this->GetExtraParam(), $this->sTableId)); $this->AddSubBlock($oBlock->GetRenderContent($oPage, $this->GetExtraParam(), $this->sTableId));
} }