From 1562cb1f38615d8afc9a0153d8eca7774bad80c8 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 1 Jul 2021 16:08:03 +0200 Subject: [PATCH 1/2] :art: Allow tab stickiness for twig based extensions (cherry picked from commit 1a7755365ca587e33e37e5f06354e27925232d41) --- sources/application/TwigBase/Controller/Controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/application/TwigBase/Controller/Controller.php b/sources/application/TwigBase/Controller/Controller.php index 7a4cafab96..7a5061f9c0 100644 --- a/sources/application/TwigBase/Controller/Controller.php +++ b/sources/application/TwigBase/Controller/Controller.php @@ -377,8 +377,8 @@ abstract class Controller $this->AddReadyScriptToPage($this->RenderTemplate($aParams, $sTemplateName, 'ready.js')); $this->AddStyleToPage($this->RenderTemplate($aParams, $sTemplateName, 'css')); if (!empty($this->m_aAjaxTabs)) { - $this->m_oPage->AddTabContainer(''); - $this->m_oPage->SetCurrentTabContainer(''); + $this->m_oPage->AddTabContainer('TwigBaseTabContainer'); + $this->m_oPage->SetCurrentTabContainer('TwigBaseTabContainer'); } foreach ($this->m_aAjaxTabs as $sTabCode => $aTabData) { $this->AddAjaxTabToPage($sTabCode, $aTabData['label'], $aTabData['url'], $aTabData['cache']); From ece3e0490d3eaac6ef0e9a172cfb887b4ad3ff35 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 30 Jun 2021 17:06:28 +0200 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B03573=20-=20Allow=20retrieving=20oper?= =?UTF-8?q?ation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e6a38a805537eb95a9adf20bec3bfe172c86dd03) --- sources/application/TwigBase/Controller/Controller.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sources/application/TwigBase/Controller/Controller.php b/sources/application/TwigBase/Controller/Controller.php index 7a5061f9c0..353f4dcc5f 100644 --- a/sources/application/TwigBase/Controller/Controller.php +++ b/sources/application/TwigBase/Controller/Controller.php @@ -625,6 +625,15 @@ abstract class Controller return Dict::S($this->m_sModule.'/Operation:'.$this->m_sOperation.'/Title'); } + /** + * @return string + * @since 3.0.0 + */ + public function GetOperation(): string + { + return $this->m_sOperation; + } + /** * @param $sContent *