Merge pull request #440 from magento-folks/switcher_stable

[Folks] Add scope selector on Product Page

Author: irenelagno

app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php

@@ -140,7 +140,7 @@ private function initAttributeValues($entityType, $entity, $storeId)
                         'a.attribute_id = t.attribute_id',
                         ['attribute_code' => 'a.attribute_code']
                     )
-                    ->where($metadata->getLinkField() . ' = ?', $entity->getId())
+                    ->where($metadata->getLinkField() . ' = ?', $entity->getData($metadata->getLinkField()))
                     ->where('t.attribute_id IN (?)', $attributeCodes)
                     ->where('t.store_id IN (?)', $storeIds);
                 $selects[] = $select;

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -498,12 +498,16 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
             $product->setCanSaveCustomOptions(true);
         }
 
-        $validationResult = $this->resourceModel->validate($product);
-        if (true !== $validationResult) {
-            throw new \Magento\Framework\Exception\CouldNotSaveException(
-                __('Invalid product data: %1', implode(',', $validationResult))
-            );
+        $useValidation = \Magento\Store\Model\Store::ADMIN_CODE === $this->storeManager->getStore()->getCode();
+        if ($useValidation) {
+            $validationResult = $this->resourceModel->validate($product);
+            if (true !== $validationResult) {
+                throw new \Magento\Framework\Exception\CouldNotSaveException(
+                    __('Invalid product data: %1', implode(',', $validationResult))
+                );
+            }
         }
+
         try {
             if ($tierPrices !== null) {
                 $product->setData('tier_price', $tierPrices);

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -256,7 +256,9 @@ protected function setUp()
             ->setMethods([])
             ->getMockForAbstractClass();
         $storeMock->expects($this->any())->method('getWebsiteId')->willReturn('1');
+        $storeMock->expects($this->any())->method('getCode')->willReturn(\Magento\Store\Model\Store::ADMIN_CODE);
         $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
+        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
 
         $this->mediaGalleryProcessor = $this->getMock(
             'Magento\Catalog\Model\Product\Gallery\Processor',