fixed cfgTags subselect in TextConcatType

heimrichhannot · Dec 20, 2018 · 8c3bd41 · 8c3bd41
1 parent aa7d2c3
commit 8c3bd41
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Filter/Type/TextConcatType.php b/src/Filter/Type/TextConcatType.php
@@ -11,6 +11,7 @@
 use Contao\Database;
 use Contao\StringUtil;
 use Contao\System;
+use Doctrine\DBAL\Query\QueryBuilder;
 use HeimrichHannot\FilterBundle\Filter\AbstractType;
 use HeimrichHannot\FilterBundle\Model\FilterConfigElementModel;
 use HeimrichHannot\FilterBundle\QueryBuilder\FilterQueryBuilder;
@@ -56,14 +57,16 @@ public function buildQuery(FilterQueryBuilder $builder, FilterConfigElementModel
                 $associationProperty = System::getContainer()->get('huh.utils.string')
                         ->removeLeadingString('tl_', $filter['dataContainer']).'_id';
 
-                $builder->innerJoin($filter['dataContainer'], $associationTable, 'ta', $filter['dataContainer'].'.id='.'ta.'.$associationProperty);
-                $builder->innerJoin($filter['dataContainer'], 'tl_cfg_tag', 'tn', 'ta.cfg_tag_id='.'tn.id');
+                $subBuilder = new QueryBuilder(System::getContainer()->get('database_connection'));
 
-                $andWhere = $builder->expr()->andX();
-                $andWhere->add('tn.name LIKE '.$wildcard);
-
-                $conditions[] = $andWhere;
-                $builder->setParameter($wildcard, '%'.strtolower($data[$name]).'%');
+                $builder->orWhere(
+                    $builder->expr()->in($filter['dataContainer'].'.id',
+                        $subBuilder->select('ta.'.$associationProperty)
+                            ->from($associationTable, 'ta')
+                            ->join('ta', 'tl_cfg_tag', 'tn', 'ta.cfg_tag_id='.'tn.id')
+                            ->where('tn.name LIKE '.$wildcard)->setParameter($wildcard, '%'.strtolower($data[$name]).'%')->getSQL()
+                    )
+                );
             } elseif (Database::getInstance()->fieldExists($field, $filter['dataContainer'])) {
                 $textualFields[] = $field;
             }