Merge branch '2.5.x' of https://github.com/Smile-SA/elasticsuite into…

… 2.5.x
Smile-SA · Feb 20, 2018 · 30e64bf · 30e64bf
2 parents 691a7f3 + 64290f6
commit 30e64bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/module-elasticsuite-catalog/view/adminhtml/web/css/source/_module.less b/src/module-elasticsuite-catalog/view/adminhtml/web/css/source/_module.less
@@ -49,7 +49,7 @@
         margin: 20px 0 0;
 
         li {
-            box-sizing: border-box;
+            box-sizing: content-box;
             float: left;
             border: 1px solid #d6d6d6;
             background: #FFFFFF;

diff --git a/...virtual-category/Model/ResourceModel/Product/Indexer/Fulltext/Datasource/CategoryData.php b/...virtual-category/Model/ResourceModel/Product/Indexer/Fulltext/Datasource/CategoryData.php
@@ -81,15 +81,21 @@ private function getBaseSelect($productIds, $storeId)
     private function getVirtualSelect($productIds)
     {
         $select = $this->getConnection()->select()
-            ->from(['cpi' => $this->getTable(ProductPositionResourceModel::TABLE_NAME)], [])
-            ->where('cpi.product_id IN(?)', $productIds)
+            ->from(['p' => $this->getTable(ProductPositionResourceModel::TABLE_NAME)], [])
+            ->joinLeft(
+                ['cpi' => $this->getTable('catalog_category_product_index')],
+                'p.product_id = cpi.product_id AND p.category_id = cpi.category_id',
+                []
+            )
+            ->where('p.product_id IN(?)', $productIds)
+            ->where('cpi.product_id IS NULL')
             ->columns(
                 [
-                    'category_id' => 'cpi.category_id',
-                    'product_id'  => 'cpi.product_id',
+                    'category_id' => 'p.category_id',
+                    'product_id'  => 'p.product_id',
                     'is_parent'   => new \Zend_Db_Expr('0'),
                     'is_virtual'  => new \Zend_Db_Expr('1'),
-                    'position'    => 'cpi.position',
+                    'position'    => 'p.position',
                 ]
             );