Merge pull request #1803 from magento-engcom/2.2-develop-prs

Oleksii Korshenko · web-flow · commit 9eb883d8a617 · 2017-12-01T22:50:29.000-06:00
Public Pull Requests magento/magento2#11444 [Backport 2.2-develop] #11324 REST API - Only associate automatically product with all websites when creating product in All Store Views scope by @adrian-martinez-interactiv4 Fixed Public Issues magento/magento2#11324 Updating a product via the REST API assigns it to all websites automatically.
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -340,16 +340,17 @@ protected function initializeProductData(array $productData, $createNew)
         foreach ($productData as $key => $value) {
             $product->setData($key, $value);
         }
-        $this->assignProductToWebsites($product);
+        $this->assignProductToWebsites($product, $createNew);
 
         return $product;
     }
 
     /**
      * @param \Magento\Catalog\Model\Product $product
+     * @param bool $createNew
      * @return void
      */
-    private function assignProductToWebsites(\Magento\Catalog\Model\Product $product)
+    private function assignProductToWebsites(\Magento\Catalog\Model\Product $product, $createNew)
     {
         $websiteIds = $product->getWebsiteIds();
 
@@ -362,7 +363,7 @@ private function assignProductToWebsites(\Magento\Catalog\Model\Product $product
             );
         }
 
-        if ($this->storeManager->getStore(true)->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {
+        if ($createNew && $this->storeManager->getStore(true)->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {
             $websiteIds = array_keys($this->storeManager->getWebsites());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -340,16 +340,17 @@ protected function initializeProductData(array $productData, $createNew)`
`340`	`340`	`foreach ($productData as $key => $value) {`
`341`	`341`	`$product->setData($key, $value);`
`342`	`342`	`}`
`343`		`- $this->assignProductToWebsites($product);`
	`343`	`+ $this->assignProductToWebsites($product, $createNew);`
`344`	`344`
`345`	`345`	`return $product;`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`/**`
`349`	`349`	`* @param \Magento\Catalog\Model\Product $product`
	`350`	`+ * @param bool $createNew`
`350`	`351`	`* @return void`
`351`	`352`	`*/`
`352`		`- private function assignProductToWebsites(\Magento\Catalog\Model\Product $product)`
	`353`	`+ private function assignProductToWebsites(\Magento\Catalog\Model\Product $product, $createNew)`
`353`	`354`	`{`
`354`	`355`	`$websiteIds = $product->getWebsiteIds();`
`355`	`356`
`@@ -362,7 +363,7 @@ private function assignProductToWebsites(\Magento\Catalog\Model\Product $product`
`362`	`363`	`);`
`363`	`364`	`}`
`364`	`365`
`365`		`- if ($this->storeManager->getStore(true)->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {`
	`366`	`+ if ($createNew && $this->storeManager->getStore(true)->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {`
`366`	`367`	`$websiteIds = array_keys($this->storeManager->getWebsites());`
`367`	`368`	`}`
`368`	`369`