浏览代码

add default behavior if no type set

Thomas Rabaix 13 年之前
父节点
当前提交
d0b568f93d
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Filter/ORM/ModelFilter.php

+ 3 - 3
Filter/ORM/ModelFilter.php

@@ -25,7 +25,7 @@ class ModelFilter extends Filter
      */
     public function filter($queryBuilder, $alias, $field, $data)
     {
-        if (!$data || !is_array($data) || !array_key_exists('type', $data) || !array_key_exists('value', $data)) {
+        if (!$data || !is_array($data) || !array_key_exists('value', $data)) {
             return;
         }
 
@@ -42,7 +42,7 @@ class ModelFilter extends Filter
             return;
         }
 
-        if ($data['type'] == BooleanType::TYPE_NO) {
+        if (isset($data['type']) && $data['type'] == BooleanType::TYPE_NO) {
             $this->applyWhere($queryBuilder, $queryBuilder->expr()->notIn(sprintf('%s.%s', $alias, $field), $data['value']));
         } else {
             $this->applyWhere($queryBuilder, $queryBuilder->expr()->in(sprintf('%s.%s', $alias, $field), $data['value']));
@@ -55,7 +55,7 @@ class ModelFilter extends Filter
             return;
         }
 
-        if ($data['type'] == BooleanType::TYPE_NO) {
+        if (isset($data['type']) && $data['type'] == BooleanType::TYPE_NO) {
             $this->applyWhere($queryBuilder, sprintf('%s.%s != :%s', $alias, $field, $this->getName()));
         } else {
             $this->applyWhere($queryBuilder, sprintf('%s.%s = :%s', $alias, $field, $this->getName()));