MAGETWO-49618: [GitHub] Product Save & Duplicate Unexpected Behavior for Multiple Store Views #3426

Author: mslabko

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -250,6 +250,7 @@ private function getCategoryLinkManagement()
 
     /**
      * @return StoreManagerInterface
+     * @deprecated
      */
     private function getStoreManager()
     {
@@ -264,6 +265,7 @@ private function getStoreManager()
      * Retrieve data persistor
      *
      * @return DataPersistorInterface|mixed
+     * @deprecated
      */
     protected function getDataPersistor()
     {

app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php

@@ -9,6 +9,7 @@
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Product validate
@@ -47,6 +48,11 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $initializationHelper;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
@@ -91,10 +97,12 @@ public function execute()
             if ($productData && !isset($productData['stock_data']['use_config_manage_stock'])) {
                 $productData['stock_data']['use_config_manage_stock'] = 0;
             }
+            $storeId = $this->getRequest()->getParam('store', 0);
+            $store = $this->getStoreManager()->getStore($storeId);
+            $this->getStoreManager()->setCurrentStore($store->getCode());
             /* @var $product \Magento\Catalog\Model\Product */
             $product = $this->productFactory->create();
             $product->setData('_edit_mode', true);
-            $storeId = $this->getRequest()->getParam('store');
             if ($storeId) {
                 $product->setStoreId($storeId);
             }
@@ -137,6 +145,19 @@ public function execute()
         return $this->resultJsonFactory->create()->setData($response);
     }
 
+    /**
+     * @return StoreManagerInterface
+     * @deprecated
+     */
+    private function getStoreManager()
+    {
+        if (null === $this->storeManager) {
+            $this->storeManager = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Store\Model\StoreManagerInterface');
+        }
+        return $this->storeManager;
+    }
+
     /**
      * @return Initialization\Helper
      * @deprecated

app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php

@@ -5,24 +5,47 @@
  */
 namespace Magento\Catalog\Plugin\Model\Attribute\Backend;
 
+use Magento\Store\Model\Store;
+
 class AttributeValidation
 {
+    /** @var \Magento\Store\Model\StoreManagerInterface */
+    private $storeManager;
+
+    /**
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        $allowedEntityTypes = []
+    ) {
+        $this->storeManager = $storeManager;
+        $this->allowedEntityTypes = $allowedEntityTypes;
+    }
+
     /**
      * @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject
      * @param \Closure $proceed
-     * @param \Magento\Framework\DataObject $product
+     * @param \Magento\Framework\DataObject $entity
      * @return bool
      */
     public function aroundValidate(
         \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject,
         \Closure $proceed,
-        \Magento\Framework\DataObject $product
+        \Magento\Framework\DataObject $entity
     ) {
-        $attrCode = $subject->getAttribute()->getAttributeCode();
-        // Null is meaning "no value" which should be overridden by value from default scope
-        if (array_key_exists($attrCode, $product->getData()) && $product->getData($attrCode) === null) {
-            return true;
+        $isAllowedType = !empty(array_filter(array_map(function($allowedEntity) use ($entity) {
+            return $entity instanceof $allowedEntity;
+        }, $this->allowedEntityTypes)));
+
+        if ($isAllowedType && $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
+            $attrCode = $subject->getAttribute()->getAttributeCode();
+            // Null is meaning "no value" which should be overridden by value from default scope
+            if (array_key_exists($attrCode, $entity->getData()) && $entity->getData($attrCode) === null) {
+                return true;
+            }
         }
-        return $proceed($product);
+
+        return $proceed($entity);
     }
 }

app/code/Magento/Catalog/etc/di.xml

@@ -473,6 +473,14 @@
     <type name="Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend">
         <plugin name="attributeValidation" type="Magento\Catalog\Plugin\Model\Attribute\Backend\AttributeValidation"/>
     </type>
+    <type name="Magento\Catalog\Plugin\Model\Attribute\Backend\AttributeValidation">
+        <arguments>
+            <argument name="allowedEntityTypes" xsi:type="array">
+                <item name="product" xsi:type="string">Magento\Catalog\Api\Data\ProductInterface</item>
+                <item name="category" xsi:type="string">Magento\Catalog\Api\Data\CategoryInterface</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\CategoryRepository">
         <arguments>
             <argument name="categoryResource" xsi:type="object">Magento\Catalog\Model\ResourceModel\Category\Proxy</argument>