fixed palette error on choice type

heimrichhannot · May 6, 2019 · d6ac423 · d6ac423
1 parent 3c76f15
commit d6ac423
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Backend/FilterConfigElement.php b/src/Backend/FilterConfigElement.php
@@ -48,8 +48,8 @@ public function modifyPalette(DataContainer $dc)
         }
 
         foreach ($config['filter']['types'] as $type) {
-            if (isset($type['name']) && $type['name'] === $filterConfigElement->type && isset($type['type'])) {
-                $foundType = $type['type'];
+            if (isset($type['name']) && $type['name'] === $filterConfigElement->type) {
+                $foundType = $type['name'];
 
                 break;
             }

diff --git a/src/QueryBuilder/FilterQueryBuilder.php b/src/QueryBuilder/FilterQueryBuilder.php
@@ -136,7 +136,7 @@ public function whereWidget(FilterConfigElementModel $element, string $name, Fil
                 $value = Controller::replaceInsertTags($value, false);
             }
 
-            $operator = $this->getOperator($element, $defaultOperator, $dca);
+            $operator = $this->getOperator($element, $defaultOperator, $dca) ?:$defaultOperator;
         } else {
             $value = $data[$name] ?? ($element->customValue ? $element->value : null);
 
@@ -145,10 +145,10 @@ public function whereWidget(FilterConfigElementModel $element, string $name, Fil
             }
 
             $operator = $this->getOperator($element, $defaultOperator, $dca);
+        }
 
-            if (!$operator) {
-                return $this;
-            }
+        if (!$operator) {
+            return $this;
         }
 
         $this->andWhere(