Fixed some caching issues

- don't cache prev block anymore if child isn't cacheable
webguys-de · Sep 18, 2017 · 0f30fec · 0f30fec
1 parent 46d0e81
commit 0f30fec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/code/community/Webguys/Easytemplate/Block/Renderer.php b/app/code/community/Webguys/Easytemplate/Block/Renderer.php
@@ -27,6 +27,7 @@ public function getCacheKeyInfo()
             Mage::app()->getStore()->getCode(),
             (int)Mage::app()->getStore()->isCurrentlySecure(),
             Mage::getSingleton('customer/session')->isLoggedIn(),
+            Mage::getSingleton('customer/session')->getCustomerGroupId(),
             $this->getGroup()->getId()
         );
     }
@@ -78,6 +79,10 @@ public function setChildsBasedOnGroup($group, $parent = null)
                         $childBlock->setTemplateCode($templateCode);
                         $childBlock->setGroup($group);
 
+                        if(!$childBlock->getCacheLifetime()) {
+                            $this->_cachingAllowed=false;
+                        }
+
                         /** @var $field Webguys_Easytemplate_Model_Input_Parser_Field */
                         foreach ($model->getFields() as $field) {
                             $fieldCode = $field->getCode();

diff --git a/app/code/community/Webguys/Easytemplate/Block/Template.php b/app/code/community/Webguys/Easytemplate/Block/Template.php
@@ -37,4 +37,13 @@ public function getChildHtml($name = '', $useCache = true, $sorted = false)
     {
         return $this->getRenderer()->toHtml();
     }
-}
+
+    public function getCacheLifetime()
+    {
+        if (!$this->hasData('cache_lifetime')) {
+            return 3600;
+        }
+        return $this->getData('cache_lifetime');
+    }
+
+}