Merge remote-tracking branch 'origin/MAGETWO-61960' into 2.0-develop-pr6

Author: zakdma

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml

@@ -53,7 +53,7 @@
     <div data-role="tabs" id="product-edit-form-tabs"></div> <?php /* @TODO: remove id after elimination of setDestElementId('product-edit-form-tabs') */?>
     <?php echo $block->getChildHtml('product-type-tabs') ?>
     <input type="hidden" id="product_type_id" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getTypeId()?>"/>
-    <input type="hidden" id="attribute_set_id" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getAttributeSetId()?>"/>
+    <input type="hidden" id="attribute_set_id" name="set" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getAttributeSetId()?>"/>
     <button type="submit" class="hidden"></button>
 <?php if ($block->getUseContainer()): ?>
 </form>

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php

@@ -51,7 +51,12 @@ public function afterInitialize(
         $attributes = $this->request->getParam('attributes');
         if ($product->getTypeId() == ConfigurableProduct::TYPE_CODE && !empty($attributes)) {
             $setId = $this->request->getPost('new-variations-attribute-set-id');
+
+            if (!$setId) {
+                $setId = $this->request->getPost('set');
+            }
             $product->setAttributeSetId($setId);
+            $product->getResource()->getSortedAttributes($setId);
             $this->productType->setUsedProductAttributeIds($attributes, $product);
 
             $product->setNewVariationsAttributeSetId($setId);

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php

@@ -51,10 +51,19 @@ public function afterInitialize(
             $configurations = json_decode($this->request->getParam('configurations_serialized'), true);
         }
         $configurations = $this->variationHandler->duplicateImagesForVariations($configurations);
+        $productsAttributeSets = [];
+
         foreach ($configurations as $productId => $productData) {
             /** @var \Magento\Catalog\Model\Product $product */
             $product = $this->productRepository->getById($productId, false, $this->request->getParam('store', 0));
             $productData = $this->variationHandler->processMediaGallery($product, $productData);
+            $productAttributeSetId = $product->getAttributeSetId();
+
+            if (!array_key_exists($productAttributeSetId, $productsAttributeSets)) {
+                $product->getResource()->getSortedAttributes($productAttributeSetId);
+                $productsAttributeSets[$productAttributeSetId] = 1;
+            }
+
             $product->addData($productData);
             if ($product->hasDataChanges()) {
                 $product->save();

app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/ConfigurableTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper\Plugin;
 
+use Magento\Catalog\Model\ResourceModel\Product;
 use \Magento\ConfigurableProduct\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Configurable;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProduct;
 
@@ -43,30 +44,31 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->productTypeMock = $this->getMock(
-            'Magento\ConfigurableProduct\Model\Product\Type\Configurable',
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable::class,
             [],
             [],
             '',
             false
         );
         $this->variationHandler = $this->getMock(
-            'Magento\ConfigurableProduct\Model\Product\VariationHandler',
+            \Magento\ConfigurableProduct\Model\Product\VariationHandler::class,
             [],
             [],
             '',
             false
         );
-        $this->requestMock = $this->getMock('\Magento\Framework\App\Request\Http', [], [], '', false);
+        $this->requestMock = $this->getMock(\Magento\Framework\App\Request\Http::class, [], [], '', false);
         $methods = [
             'setNewVariationsAttributeSetId',
             'setAssociatedProductIds',
             'setCanSaveConfigurableAttributes',
             'getTypeId',
+            'getResource',
             '__wakeup',
         ];
-        $this->productMock = $this->getMock('Magento\Catalog\Model\Product', $methods, [], '', false);
+        $this->productMock = $this->getMock(\Magento\Catalog\Model\Product::class, $methods, [], '', false);
         $this->subjectMock = $this->getMock(
-            'Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper',
+            \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper::class,
             [],
             [],
             '',
@@ -77,13 +79,16 @@ protected function setUp()
 
     public function testAfterInitializeIfAttributesNotEmptyAndActionNameNotGenerateVariations()
     {
+        $postValue = 'postValue';
+        $productResourceMock = $this->getProductResource($postValue);
+
         $this->productMock->expects($this->once())->method('getTypeId')->willReturn(ConfigurableProduct::TYPE_CODE);
+        $this->productMock->expects($this->once())->method('getResource')->willReturn($productResourceMock);
         $associatedProductIds = ['key' => 'value'];
         $associatedProductIdsSerialized = json_encode($associatedProductIds);
         $generatedProductIds = ['key_one' => 'value_one'];
         $expectedArray = ['key' => 'value', 'key_one' => 'value_one'];
         $attributes = ['key' => 'value'];
-        $postValue = 'postValue';
         $variationsMatrix = ['variationKey' => 'variationValue'];
         $variationsMatrixSerialized = json_encode($variationsMatrix);
 
@@ -125,11 +130,13 @@ public function testAfterInitializeIfAttributesNotEmptyAndActionNameNotGenerateV
 
     public function testAfterInitializeIfAttributesNotEmptyAndActionNameGenerateVariations()
     {
+        $postValue = 'postValue';
+        $productResourceMock = $this->getProductResource($postValue);
         $this->productMock->expects($this->once())->method('getTypeId')->willReturn(ConfigurableProduct::TYPE_CODE);
+        $this->productMock->expects($this->once())->method('getResource')->willReturn($productResourceMock);
         $associatedProductIds = ['key' => 'value'];
         $associatedProductIdsSerialized = json_encode($associatedProductIds);
         $attributes = ['key' => 'value'];
-        $postValue = 'postValue';
         $valueMap = [
             ['new-variations-attribute-set-id', null, $postValue],
             ['associated_product_ids_serialized', '[]', $associatedProductIdsSerialized],
@@ -182,4 +189,21 @@ public function testAfterInitializeForNotConfigurableProduct()
         $this->productTypeMock->expects($this->never())->method('generateSimpleProducts');
         $this->plugin->afterInitialize($this->subjectMock, $this->productMock);
     }
+
+    /**
+     * generate product resource model mock
+     * @param $postValue
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getProductResource($postValue)
+    {
+        $productResourceMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productResourceMock->expects(self::once())
+            ->method('getSortedAttributes')
+            ->with($postValue);
+
+        return $productResourceMock;
+    }
 }

app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml

@@ -164,10 +164,11 @@
                 $('[data-role=new-variations-attribute-set-id]').val($('#attribute_set_id').val());
                 return; // all selected configurable attributes belong to current attribute set
             }
-            if (!$('[data-role=product-variations-matrix] [data-column=entity_id]')
-                .closest('tr').has('input[name$="[name]"]').length
-            ) {
-                return; // no new simple products to save from matrix: uniting attribute set is not needed
+
+            var regex = /id\/(\d+)(?:\/)?/g;
+            var existingProductPage = regex.exec(BASE_URL);
+            if (existingProductPage != null) {
+                return; // it is not new product page
             }
 
             event.stopImmediatePropagation();