Update filter

Prezent · May 31, 2018 · 3946618 · 3946618
1 parent 45e5b5e
commit 3946618
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Filter/TranslatableFilter.php b/Filter/TranslatableFilter.php
@@ -80,7 +80,16 @@ public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
 
         // c.name > '1' => c.name OPERATOR :FIELDNAME
         $parameterName = $this->getNewParameterName($queryBuilder);
-        $this->applyWhere($queryBuilder, sprintf('%s.%s %s :%s', 'trans', $field, $operator, $parameterName));
+
+        $or = $queryBuilder->expr()->orX();
+
+        $or->add(sprintf('%s.%s %s :%s', 'trans', $field, $operator, $parameterName));
+
+        if (ChoiceType::TYPE_NOT_CONTAINS == $data['type']) {
+            $or->add($queryBuilder->expr()->isNull(sprintf('%s.%s', 'trans', $field)));
+        }
+
+        $this->applyWhere($queryBuilder, $or);
 
         if ($data['type'] == ChoiceType::TYPE_EQUAL) {
             $queryBuilder->setParameter($parameterName, $data['value']);