Skip to content

Commit 936f6e9

Browse files
MAGETWO-69085: Do not hardcode product link types #9600
2 parents 657b5ad + 14b2709 commit 936f6e9

File tree

2 files changed

+286
-15
lines changed
  • app/code/Magento/Catalog
    • Controller/Adminhtml/Product/Initialization
    • Test/Unit/Controller/Adminhtml/Product/Initialization

2 files changed

+286
-15
lines changed

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ class Helper
7575
*/
7676
private $dateTimeFilter;
7777

78+
/**
79+
* @var \Magento\Catalog\Model\Product\LinkTypeProvider
80+
*/
81+
private $linkTypeProvider;
82+
7883
/**
7984
* Helper constructor.
8085
* @param \Magento\Framework\App\RequestInterface $request
@@ -83,21 +88,25 @@ class Helper
8388
* @param ProductLinks $productLinks
8489
* @param \Magento\Backend\Helper\Js $jsHelper
8590
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
91+
* @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
8692
*/
8793
public function __construct(
8894
\Magento\Framework\App\RequestInterface $request,
8995
\Magento\Store\Model\StoreManagerInterface $storeManager,
9096
StockDataFilter $stockFilter,
9197
\Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks,
9298
\Magento\Backend\Helper\Js $jsHelper,
93-
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
99+
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
100+
\Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider = null
94101
) {
95102
$this->request = $request;
96103
$this->storeManager = $storeManager;
97104
$this->stockFilter = $stockFilter;
98105
$this->productLinks = $productLinks;
99106
$this->jsHelper = $jsHelper;
100107
$this->dateFilter = $dateFilter;
108+
$this->linkTypeProvider = $linkTypeProvider ?: \Magento\Framework\App\ObjectManager::getInstance()
109+
->get(\Magento\Catalog\Model\Product\LinkTypeProvider::class);
101110
}
102111

103112
/**
@@ -244,11 +253,17 @@ protected function setProductLinks(\Magento\Catalog\Model\Product $product)
244253

245254
$product = $this->productLinks->initializeLinks($product, $links);
246255
$productLinks = $product->getProductLinks();
247-
$linkTypes = [
248-
'related' => $product->getRelatedReadonly(),
249-
'upsell' => $product->getUpsellReadonly(),
250-
'crosssell' => $product->getCrosssellReadonly()
251-
];
256+
$linkTypes = [];
257+
258+
/** @var \Magento\Catalog\Api\Data\ProductLinkTypeInterface $linkTypeObject */
259+
foreach ($this->linkTypeProvider->getItems() as $linkTypeObject) {
260+
$linkTypes[$linkTypeObject->getName()] = $product->getData($linkTypeObject->getName() . '_readonly');
261+
}
262+
263+
// skip linkTypes that were already processed on initializeLinks plugins
264+
foreach ($productLinks as $productLink) {
265+
unset($linkTypes[$productLink->getLinkType()]);
266+
}
252267

253268
foreach ($linkTypes as $linkType => $readonly) {
254269
if (isset($links[$linkType]) && !$readonly) {

0 commit comments

Comments
 (0)