Merge pull request #1473 from wuwx/patch-1

[8.0] Fix filtered records total when using filterColumn.
yajra · Oct 27, 2017 · 03fe790 · 03fe790
2 parents f2044df + e15d509
commit 03fe790
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -226,13 +226,12 @@ public function columnSearch()
             if ($this->hasFilterColumn($column)) {
                 $keyword = $this->getColumnSearchKeyword($index, $raw = true);
                 $this->applyFilterColumn($this->getBaseQueryBuilder(), $column, $keyword);
-                continue;
+            } else {
+                $column  = $this->resolveRelationColumn($column);
+                $keyword = $this->getColumnSearchKeyword($index);
+                $this->compileColumnSearch($index, $column, $keyword);
             }
 
-            $column  = $this->resolveRelationColumn($column);
-            $keyword = $this->getColumnSearchKeyword($index);
-            $this->compileColumnSearch($index, $column, $keyword);
-
             $this->isFilterApplied = true;
         }
     }