From e347739bd3278fbcec1d9261fb990fd31874ff81 Mon Sep 17 00:00:00 2001 From: MaxBuhe01 Date: Wed, 19 Mar 2025 08:31:56 +0100 Subject: [PATCH] [Changed] remove save-logic from Getter-Method --- .../Controller/Admin/GA4AdminUserInterface_main.php | 7 ++++++- Application/Model/ManagerHandler.php | 13 ++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Controller/Admin/GA4AdminUserInterface_main.php b/Application/Controller/Admin/GA4AdminUserInterface_main.php index b0e6a46..b9e504d 100644 --- a/Application/Controller/Admin/GA4AdminUserInterface_main.php +++ b/Application/Controller/Admin/GA4AdminUserInterface_main.php @@ -21,7 +21,12 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle $this->addTplParam('d3ViewObject', $this); $this->addTplParam('d3ViewConfObject', Registry::get(ViewConfig::class)); $this->addTplParam('d3ManagerTypeArray', oxNew(ManagerTypes::class)->getManagerList()); - $this->addTplParam('d3CurrentCMP', oxNew(ManagerHandler::class)->getCurrManager()); + + $sActManager = oxNew(ManagerHandler::class)->getCurrManager(); + $this->addTplParam('d3CurrentCMP', $sActManager); + + //Todo: hier ein Test, ist es denn nötig IMMER, meinen Wert zu speichern? Eigentlich doch nur, wenn ich im Admin auf speichern klicke! + //oxNew(ManagerHandler::class)->d3SaveShopConfVar($sActManager); return $return; } diff --git a/Application/Model/ManagerHandler.php b/Application/Model/ManagerHandler.php index 3bb71ca..d95a333 100644 --- a/Application/Model/ManagerHandler.php +++ b/Application/Model/ManagerHandler.php @@ -14,21 +14,18 @@ class ManagerHandler */ public function getCurrManager() :string { + if ($this->getModuleSettingExplicitManagerSelectValue()){ + return $this->getExplicitManager(); + } + /** @var ManagerTypes $oManagerTypes */ $oManagerTypes = oxNew(ManagerTypes::class); - /** @var ViewConfig $oViewConfig */ $oViewConfig = oxNew(ViewConfig::class); - $aManagerList = $oManagerTypes->getManagerList(); - if ($this->getModuleSettingExplicitManagerSelectValue()){ - return $this->getExplicitManager(); - } - foreach ($aManagerList as $shopModuleId => $publicCMPName){ if ($oViewConfig->isModuleActive($shopModuleId)){ - $this->d3SaveShopConfVar($shopModuleId); return $shopModuleId; } } @@ -71,8 +68,6 @@ class ManagerHandler ? $sPotentialManagerName : "NONE"; - $this->d3SaveShopConfVar($sCMPName); - return $sCMPName; } } \ No newline at end of file