Merge pull request #197 from ThaDafinser/feature/noCache

export without cache
ThaDafinser · Aug 7, 2015 · f8279c7 · f8279c7
2 parents cf042e7 + 2c3522a
commit f8279c7
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/ZfcDatagrid/Renderer/AbstractRenderer.php b/src/ZfcDatagrid/Renderer/AbstractRenderer.php
@@ -332,13 +332,13 @@ public function getCacheData()
     /**
      *
      * @throws \Exception
-     * @return array
+     * @return array|false
      */
     private function getCacheSortConditions()
     {
         $cacheData = $this->getCacheData();
         if (! isset($cacheData['sortConditions'])) {
-            throw new \Exception('Sort conditions from cache are missing!');
+            return false;
         }
 
         return $cacheData['sortConditions'];
@@ -347,13 +347,13 @@ private function getCacheSortConditions()
     /**
      *
      * @throws \Exception
-     * @return array
+     * @return array|false
      */
     private function getCacheFilters()
     {
         $cacheData = $this->getCacheData();
         if (! isset($cacheData['filters'])) {
-            throw new \Exception('Filters from cache are missing!');
+            return false;
         }
 
         return $cacheData['filters'];
@@ -493,7 +493,7 @@ public function getSortConditions()
             return $this->sortConditions;
         }
 
-        if ($this->isExport() === true) {
+        if ($this->isExport() === true && $this->getCacheSortConditions() !== false) {
             // Export renderer should always retrieve the sort conditions from cache!
             $this->sortConditions = $this->getCacheSortConditions();
 
@@ -558,7 +558,8 @@ public function getFilters()
         if (is_array($this->filters)) {
             return $this->filters;
         }
-        if ($this->isExport() === true) {
+
+        if ($this->isExport() === true && $this->getCacheFilters() !== false) {
             // Export renderer should always retrieve the filters from cache!
             $this->filters = $this->getCacheFilters();