Skip to content

Commit 9ef6cda

Browse files
author
Oleksii Korshenko
committed
MAGETWO-85286: 8176: LinkManagement::getChildren() does not include product visibility. #986
- Merge Pull Request magento-engcom/magento2ce#986 from nmalevanec/magento2:8176 - Merged commits: 1. 8bde633
2 parents d865ef1 + 8bde633 commit 9ef6cda

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\ConfigurableProduct\Model\Product\Type;
78

89
use Magento\Catalog\Api\Data\ProductAttributeInterface;
@@ -682,7 +683,7 @@ private function saveConfigurableOptions(ProductInterface $product)
682683
->setProductId($product->getData($metadata->getLinkField()))
683684
->save();
684685
}
685-
/** @var $configurableAttributesCollection \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection */
686+
/** @var $configurableAttributesCollection \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection */
686687
$configurableAttributesCollection = $this->_attributeCollectionFactory->create();
687688
$configurableAttributesCollection->setProductFilter($product);
688689
$configurableAttributesCollection->addFieldToFilter(
@@ -1397,7 +1398,16 @@ private function getConfiguredUsedProductCollection(\Magento\Catalog\Model\Produ
13971398
->addFilterByRequiredOptions()
13981399
->setStoreId($product->getStoreId());
13991400

1400-
$requiredAttributes = ['name', 'price', 'weight', 'image', 'thumbnail', 'status', 'media_gallery'];
1401+
$requiredAttributes = [
1402+
'name',
1403+
'price',
1404+
'weight',
1405+
'image',
1406+
'thumbnail',
1407+
'status',
1408+
'visibility',
1409+
'media_gallery'
1410+
];
14011411
foreach ($requiredAttributes as $attributeCode) {
14021412
$collection->addAttributeToSelect($attributeCode);
14031413
}

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,6 @@ protected function setUp()
197197
->disableOriginalConstructor()
198198
->getMock();
199199

200-
$this->productFactory = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterfaceFactory::class)
201-
->setMethods(['create'])
202-
->disableOriginalConstructor()
203-
->getMock();
204-
205200
$this->salableProcessor = $this->createMock(SalableProcessor::class);
206201

207202
$this->model = $this->objectHelper->getObject(

dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ public function testGetChildren()
5757

5858
$this->assertArrayHasKey('status', $product);
5959
$this->assertEquals('1', $product['status']);
60+
61+
$this->assertArrayHasKey('visibility', $product);
62+
$this->assertEquals('1', $product['visibility']);
6063
}
6164
}
6265

0 commit comments

Comments
 (0)