Merge remote-tracking branch 'arcticfoxes/MC-15305' into pr

magento · Mar 8, 2019 · 95e7c38 · 95e7c38
2 parents 5fbfd81 + dc91429
commit 95e7c38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...de/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php b/...de/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
@@ -123,10 +123,12 @@ public function getFields(array $context = []): array
 
         $groups = $this->groupRepository->getList($searchCriteria)->getItems();
         $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
+        $ctx = isset($context['websiteId']) ? ['websiteId' => $context['websiteId']] : [];
         foreach ($groups as $group) {
+            $ctx['customerGroupId'] = $group->getId();
             $groupPriceKey = $this->fieldNameResolver->getFieldName(
                 $priceAttribute,
-                ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
+                $ctx
             );
             $allAttributes[$groupPriceKey] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),

diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -158,7 +158,7 @@
     <type name="Magento\Search\Model\Search\PageSizeProvider">
         <arguments>
             <argument name="pageSizeBySearchEngine" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="number">2147483647</item>
+                <item name="elasticsearch6" xsi:type="number">10000</item>
             </argument>
         </arguments>
     </type>