Merge pull request #13 from northernco/column-use-having

Add a setting to use having for column filtering
northernco · Dec 10, 2021 · 4eff124 · 4eff124
2 parents 0aed716 + e575f7f
commit 4eff124
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Grid/Column/Column.php b/Grid/Column/Column.php
@@ -118,6 +118,7 @@ abstract class Column
     protected $export;
     protected $class;
     protected $isManualField;
+    protected $useHaving;
     protected $isAggregate;
     protected $usePrefixTitle;
     protected $translationDomain;
@@ -156,6 +157,7 @@ public function __initialize(array $params)
         $this->setValues($this->getParam('values', []));
         $this->setOperatorsVisible($this->getParam('operatorsVisible', true));
         $this->setIsManualField($this->getParam('isManualField', false));
+        $this->setUseHaving($this->getParam('useHaving', false));
         $this->setIsAggregate($this->getParam('isAggregate', false));
         $this->setUsePrefixTitle($this->getParam('usePrefixTitle', true));
 
@@ -1010,6 +1012,16 @@ public function getIsManualField()
         return $this->isManualField;
     }
 
+    public function setUseHaving($useHaving)
+    {
+        $this->useHaving = $useHaving;
+    }
+
+    public function getUseHaving()
+    {
+        return $this->useHaving;
+    }
+
     public function setIsAggregate($isAggregate)
     {
         $this->isAggregate = $isAggregate;

diff --git a/Grid/Source/Entity.php b/Grid/Source/Entity.php
@@ -427,7 +427,7 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
                 $isDisjunction = $column->getDataJunction() === Column::DATA_DISJUNCTION;
 
                 $dqlMatches = [];
-                $hasHavingClause = $column->hasDQLFunction($dqlMatches) || $column->getIsAggregate();
+                $hasHavingClause = $column->hasDQLFunction($dqlMatches) || $column->getIsAggregate() || $column->getUseHaving();
                 if(isset($dqlMatches['function']) && $dqlMatches['function'] == 'translation_agg'){
                     $hasHavingClause = false;
                 }