Merge branch 'master' of github.com:o5/grido

o5 · May 26, 2014 · c7eec65 · c7eec65
2 parents 7e0267b + 5a45cc0
commit c7eec65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 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;
             }
         }
 

diff --git a/Grido/DataSources/IDataSource.php b/Grido/DataSources/IDataSource.php
@@ -12,7 +12,7 @@
 namespace Grido\DataSources;
 
 /**
- * Defined method that must be implemented data source.
+ * The interface defines methods that must be implemented by each data source.
  *
  * @package     Grido
  * @subpackage  DataSources