Merge pull request #171 from tobias-93/many-to-many-filters

Fixes filtering on Many-to-many relations

Author: sescandell

Builder/Admin/BaseBuilder.php

@@ -110,6 +110,8 @@ protected function createColumn($columnName, $withForms = false)
             )
         ));
 
+        $column->setManyToMany($this->getFieldGuesser()->getManyToMany($this->getVariable('model'), $columnName));
+
         $column->setSortType($this->getFieldGuesser()->getSortType($column->getDbType()));
 
         $column->setPrimaryKey($this->getFieldOption(

Generator/Column.php

@@ -148,6 +148,8 @@ class Column
     /* Used for more verbose error messages */
     protected $debug = array();
 
+    protected $manyToMany = false;
+
     /**
      * @param string $name
      * @param array  $debug
@@ -438,6 +440,16 @@ public function getGridClass()
         return $this->gridClass;
     }
 
+    public function setManyToMany($manyToMany)
+    {
+        $this->manyToMany = $manyToMany;
+    }
+
+    public function getManyToMany()
+    {
+        return $this->manyToMany;
+    }
+
     protected function parseOption($option)
     {
         if (is_array($option)) {

Guesser/DoctrineODMFieldGuesser.php

@@ -38,6 +38,12 @@ public function getAllFields($class)
         return array_merge($this->getMetadatas($class)->getFieldNames(), $this->getMetadatas($class)->getAssociationNames());
     }
 
+    public function getManyToMany($model, $fieldPath)
+    {
+        $resolved = $this->resolveRelatedField($model, $fieldPath);
+        return !$this->getMetadatas($resolved['class'])->isAssociationWithSingleJoinColumn($resolved['field']);
+    }
+
     /**
      * Find out the database type for given model field path.
      *

Guesser/DoctrineORMFieldGuesser.php

@@ -40,6 +40,12 @@ public function getAllFields($class)
         return array_merge($this->getMetadatas($class)->getFieldNames(), $this->getMetadatas($class)->getAssociationNames());
     }
 
+    public function getManyToMany($model, $fieldPath)
+    {
+        $resolved = $this->resolveRelatedField($model, $fieldPath);
+        return !$this->getMetadatas($resolved['class'])->isAssociationWithSingleJoinColumn($resolved['field']);
+    }
+
     /**
      * Find out the database type for given model field path.
      *

Guesser/PropelORMFieldGuesser.php

@@ -47,6 +47,16 @@ public function getAllFields($class)
         return $return;
     }
 
+    public function getManyToMany($model, $fieldPath)
+    {
+        $resolved = $this->resolveRelatedField($model, $fieldPath);
+        $relation = $this->getRelation($resolved['field'], $resolved['class']);
+
+        if ($relation) {
+          return \RelationMap::MANY_TO_MANY === $relation->getType();
+        }
+    }
+
     /**
      * Find out the database type for given model field path.
      *

QueryFilter/DoctrineQueryFilter.php

@@ -80,17 +80,24 @@ public function addTextFilter($field, $value)
         $this->addStringFilter($field, $value);
     }
 
-    public function addCollectionFilter($field, $value)
+    public function addCollectionFilter($field, $value, $manyToMany = false)
     {
         list($tableAlias, $filteredField) = $this->addTablePathToField($field);
-
         if (!is_array($value)) {
             $value = array($value->getId());
         }
 
         $paramName = $this->getParamName($tableAlias.'_'.$filteredField);
+
+        if ($manyToMany) {
+            if (!in_array($filteredField, $this->joins)) {
+                $this->query->join($tableAlias . '.' . $filteredField, $filteredField . '_table_filter_join');
+            }
+            $this->query->andWhere(sprintf('%s.%s IN (:%s)', $filteredField . '_table_filter_join', 'id', $paramName));
+        } else {
+            $this->query->andWhere(sprintf('%s.%s IN (:%s)', $tableAlias, $filteredField, $paramName));
+        }
         $this->query->groupBy('q');
-        $this->query->andWhere(sprintf('%s.%s IN (:%s)', $tableAlias, $filteredField, $paramName));
         $this->query->setParameter($paramName, $value);
 
     }

Resources/templates/Doctrine/ListBuilderAction.php.twig

@@ -149,7 +149,7 @@
      */
     protected function filter{{ filter|classify }}($queryFilter, $value)
     {
-        $queryFilter->add{{ builder.fieldGuesser().dbType(model, column.filterOn)|classify }}Filter('{{ column.filterOn }}', $value);
+        $queryFilter->add{{ builder.fieldGuesser().dbType(model, column.filterOn)|classify }}Filter('{{ column.filterOn }}', $value{{ column.manyToMany ? ', ' ~ column.manyToMany : '' }});
     }
     {% endfor %}
 {% endblock %}