Merge pull request #133 from pajousek/patch-1

Fixed filtering in Doctrine over joined columns
o5 · May 13, 2014 · ce8bb1a · ce8bb1a
2 parents bdaf215 + 1eb48d6
commit ce8bb1a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Grido/DataSources/Doctrine.php b/Grido/DataSources/Doctrine.php
@@ -12,7 +12,8 @@
 namespace Grido\DataSources;
 
 use Doctrine\ORM\Tools\Pagination\Paginator,
-    Grido\Components\Filters\Condition;
+    Grido\Components\Filters\Condition,
+    Nette\Utils\Strings;
 
 /**
  * Doctrine data source.
@@ -137,7 +138,7 @@ protected function makeWhere(Condition $condition, \Doctrine\ORM\QueryBuilder $q
             if (!Condition::isOperator($column)) {
                 $columns[$key] = isset($this->filterMapping[$column])
                     ? $this->filterMapping[$column]
-                    : $this->qb->getRootAlias() . '.' . $column;
+                    : Strings::contains($column, ".") ? $column : $this->qb->getRootAlias() . '.' . $column;
             }
         }