From 25c840e0363c2faaba1330304330a1b2d1e577e2 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 26 Feb 2021 10:13:56 +0100 Subject: [PATCH] Rename subtitle block variable in PanelEnhanced --- application/dashlet.class.inc.php | 2 +- .../UI/Base/Component/Panel/PanelEnhanced.php | 14 +++++++------- .../base/components/panel/panelenhanced.html.twig | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php index 460ab3460..307f885bb 100644 --- a/application/dashlet.class.inc.php +++ b/application/dashlet.class.inc.php @@ -2056,7 +2056,7 @@ class DashletHeaderDynamic extends Dashlet $sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM) $oBlock->DisplayIntoContentBlock($oPanel, $oPage, $sBlockId, array_merge($aExtraParams, $aParams)); - $oSubTitle = $oPanel->GetSubTitle(); + $oSubTitle = $oPanel->GetSubTitleBlock(); $oSet = new DBObjectSet($oFilter); $iCount = $oSet->Count(); $oAppContext = new ApplicationContext(); diff --git a/sources/application/UI/Base/Component/Panel/PanelEnhanced.php b/sources/application/UI/Base/Component/Panel/PanelEnhanced.php index 95a7e79d9..3d44e877a 100644 --- a/sources/application/UI/Base/Component/Panel/PanelEnhanced.php +++ b/sources/application/UI/Base/Component/Panel/PanelEnhanced.php @@ -16,7 +16,7 @@ class PanelEnhanced extends Panel public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/panel/panelenhanced'; /** @var UIContentBlock */ - protected $sSubTitle; + protected $oSubTitleBlock; /** @var string */ protected $sIconUrl; @@ -29,26 +29,26 @@ class PanelEnhanced extends Panel public function __construct(string $sTitle, string $sIconUrl) { parent::__construct($sTitle); - $this->sSubTitle = new UIContentBlock(); + $this->oSubTitleBlock = new UIContentBlock(); $this->sIconUrl = $sIconUrl; } /** * @return UIContentBlock */ - public function GetSubTitle(): UIContentBlock + public function GetSubTitleBlock(): UIContentBlock { - return $this->sSubTitle; + return $this->oSubTitleBlock; } /** - * @param UIContentBlock $sSubTitle + * @param \Combodo\iTop\Application\UI\Base\Layout\UIContentBlock $oSubTitleBlock * * @return PanelEnhanced */ - public function SetSubTitle(UIContentBlock $sSubTitle): PanelEnhanced + public function SetSubTitleBlock(UIContentBlock $oSubTitleBlock): PanelEnhanced { - $this->sSubTitle = $sSubTitle; + $this->oSubTitleBlock = $oSubTitleBlock; return $this; } diff --git a/templates/base/components/panel/panelenhanced.html.twig b/templates/base/components/panel/panelenhanced.html.twig index 8961c976a..d51d0888b 100644 --- a/templates/base/components/panel/panelenhanced.html.twig +++ b/templates/base/components/panel/panelenhanced.html.twig @@ -9,7 +9,7 @@
{{ oUIBlock.GetTitle() }}
- {% for oSubBlock in oUIBlock.GetSubTitle().GetSubBlocks() %} + {% for oSubBlock in oUIBlock.GetSubTitleBlock().GetSubBlocks() %} {{ render_block(oSubBlock, {aPage: aPage}) }} {% endfor %}