MAGETWO-91570: [2.2.x] - [Github]Can not save attribute #5907

- swatches fix

Author: rganin

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

@@ -182,18 +182,17 @@ define([
         }
         editForm.on('submit', function () {
             editForm
-                .find('input[name^="option"]')
+                .find('#manage-options-panel input[name^="option"]')
                 .each(function() {
                     optionsValues.push(this.name + '=' + jQuery(this).val());
-                    this.closest('tr').hide()
                 });
             jQuery('<input>')
                 .attr({
                     type: 'hidden',
                     name: 'serialized_options'
                 })
                 .val(JSON.stringify(optionsValues))
-                .prependTo('#edit_form');
+                .prependTo(editForm);
             optionPanel.find('table')
                 .replaceWith(jQuery('<div>').text(jQuery.mage.__('Sending attribute values as package.')));
         });

app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php

@@ -24,6 +24,8 @@ class Save
     public function beforeDispatch(Attribute\Save $subject, RequestInterface $request)
     {
         $data = $request->getPostValue();
+        $data['serialized_options'] = $data['serialized_swatch_values'];
+        unset($data['serialized_swatch_values']);
         if (isset($data['frontend_input'])) {
             switch ($data['frontend_input']) {
                 case 'swatch_visual':

app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js

@@ -414,6 +414,7 @@ define([
             };
 
         $(function () {
+            var editForm = $('#edit_form');
             $('#frontend_input').bind('change', function () {
                 swatchProductAttributes.bindAttributeInputType();
             });
@@ -427,6 +428,34 @@ define([
             $('.attribute-popup .collapse, [data-role="advanced_fieldset-content"]')
                 .collapsable()
                 .collapse('hide');
+
+            editForm.on('submit', function () {
+                var activePanel,
+                    swatchValues = [],
+                    swatchVisualPanel = $('#swatch-visual-options-panel'),
+                    swatchTextPanel = $('#swatch-text-options-panel');
+
+                activePanel = swatchTextPanel.is(":visible") ? swatchTextPanel : swatchVisualPanel;
+
+                activePanel
+                    .find('table input')
+                    .each(function() {
+                        swatchValues.push(this.name + '=' + $(this).val());
+                    });
+
+                $('<input>')
+                    .attr({
+                        type: 'hidden',
+                        name: 'serialized_swatch_values'
+                    })
+                    .val(JSON.stringify(swatchValues))
+                    .prependTo(editForm);
+
+                [swatchVisualPanel, swatchTextPanel].forEach(function(el) {
+                    $(el).find('table')
+                        .replaceWith($('<div>').text($.mage.__('Sending swatch values as package.')));
+                });
+            });
         });
 
         window.saveAttributeInNewSet = swatchProductAttributes.saveAttributeInNewSet;