Merge pull request #226 from romainruaud/fix_advanced_search

Fixing application of range query and its usage in advanced search.
Smile-SA · Nov 30, 2016 · 13bbbb6 · 13bbbb6
2 parents 50702f7 + 05cbec5
commit 13bbbb6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/module-elasticsuite-catalog/Model/ResourceModel/Product/Advanced/Collection.php b/src/module-elasticsuite-catalog/Model/ResourceModel/Product/Advanced/Collection.php
@@ -38,6 +38,7 @@ public function addFieldsToFilter($fields)
             foreach ($fields as $fieldByType) {
                 foreach ($fieldByType as $attributeId => $condition) {
                     $attributeCode = $this->getEntity()->getAttribute($attributeId)->getAttributeCode();
+                    $condition     = array_filter($condition, 'strlen');
                     $this->addFieldToFilter($attributeCode, $condition);
                 }
             }

diff --git a/src/module-elasticsuite-core/Search/Request/Query/Filter/QueryBuilder.php b/src/module-elasticsuite-core/Search/Request/Query/Filter/QueryBuilder.php
@@ -119,7 +119,7 @@ private function prepareFieldCondition(FieldInterface $field, $condition)
         $queryType = QueryInterface::TYPE_TERMS;
         $condition = $this->prepareCondition($condition);
 
-        if (count(array_intersect(['gt', 'gte', 'lt', 'lte'], array_keys($condition))) > 1) {
+        if (count(array_intersect(['gt', 'gte', 'lt', 'lte'], array_keys($condition))) >= 1) {
             $queryType = QueryInterface::TYPE_RANGE;
             $condition = ['bounds' => $condition];
         }