Merge remote-tracking branch 'origin/MAGETWO-58651' into BUGS

Author: Sergii Kovalenko

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

@@ -97,7 +97,6 @@ public function execute()
         $productTypeId = $this->getRequest()->getParam('type');
         if ($data) {
             try {
-                $this->unserializeProductData($data);
                 $product = $this->initializationHelper->initialize(
                     $this->productBuilder->build($this->getRequest())
                 );
@@ -181,30 +180,6 @@ public function execute()
         return $resultRedirect;
     }
 
-    /**
-     * Unserialize product data for configurable products
-     *
-     * @param array $postData
-     * @return void
-     */
-    private function unserializeProductData($postData)
-    {
-        if (isset($postData["configurable-matrix-serialized"])) {
-            $configurableMatrixSerialized = $postData["configurable-matrix-serialized"];
-            if ($configurableMatrixSerialized != null && !empty($configurableMatrixSerialized)) {
-                $postData["configurable-matrix"] = json_decode($configurableMatrixSerialized, true);
-                unset($postData["configurable-matrix-serialized"]);
-            }
-        }
-        if (isset($postData["associated_product_ids_serialized"])) {
-            $associatedProductIdsSerialized = $postData["associated_product_ids_serialized"];
-            if ($associatedProductIdsSerialized != null && !empty($associatedProductIdsSerialized)) {
-                $postData["associated_product_ids"] = json_decode($associatedProductIdsSerialized, true);
-                unset($postData["associated_product_ids_serialized"]);
-            }
-        }
-    }
-
     /**
      * Notify customer when image was not deleted in specific case.
      * TODO: temporary workaround must be eliminated in MAGETWO-45306

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js

@@ -383,12 +383,7 @@ define([
          * Chose action for the form save button
          */
         saveFormHandler: function () {
-            this.source.data['configurable-matrix-serialized'] =
-                JSON.stringify(this.source.data['configurable-matrix']);
-            delete this.source.data['configurable-matrix'];
-            this.source.data['associated_product_ids_serialized'] =
-                JSON.stringify(this.source.data['associated_product_ids']);
-            delete this.source.data['associated_product_ids'];
+            this.serializeData();
 
             if (this.checkForNewAttributes()) {
                 this.formSaveParams = arguments;
@@ -398,6 +393,31 @@ define([
             }
         },
 
+        /**
+         * Serialize data for specific form fields
+         *
+         * Get data from outdated fields, serialize it and produce new form fields.
+         *
+         * Outdated fields:
+         *   - configurable-matrix;
+         *   - associated_product_ids.
+         *
+         * New fields:
+         *   - configurable-matrix-serialized;
+         *   - associated_product_ids_serialized.
+         */
+        serializeData: function () {
+            this.source.data['configurable-matrix-serialized'] =
+                JSON.stringify(this.source.data['configurable-matrix']);
+
+            delete this.source.data['configurable-matrix'];
+
+            this.source.data['associated_product_ids_serialized'] =
+                JSON.stringify(this.source.data['associated_product_ids']);
+
+            delete this.source.data['associated_product_ids'];
+        },
+
         /**
          * Check for newly added attributes
          * @returns {Boolean}