From 83313ce1d58c38565b4a8db3802ba2886c7feb68 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 31 Oct 2023 14:01:19 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B06866=20-=20Fix=20usages=20of=20hard-code?= =?UTF-8?q?d=20"listInObject"=20to=20\DisplayBlock::ENUM=5FSTYLE=5FLIST=5F?= =?UTF-8?q?IN=5FOBJECT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/displayblock.class.inc.php | 2 +- .../UI/Base/Component/DataTable/DataTableUIBlockFactory.php | 3 ++- sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 6c4fda610..37515dd1e 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -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) { switch ($iSetCount) { diff --git a/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php index e6aeb03cd..7d550c14d 100644 --- a/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php +++ b/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php @@ -25,6 +25,7 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use Combodo\iTop\Controller\AjaxRenderController; use DBObjectSet; use Dict; +use DisplayBlock; use MenuBlock; use MetaModel; use UserRights; @@ -100,7 +101,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory $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); } /** diff --git a/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php b/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php index 10f08155a..53081b659 100644 --- a/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php +++ b/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php @@ -196,7 +196,7 @@ abstract class AbstractBlockLinkSetViewTable extends UIContentBlock $oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData()); // 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)); }