MAGETWO-54733: Unable to save product with all unchecked values for m…

…ultiple select attribute #7687
magento · Jan 16, 2017 · 85db4c8 · 85db4c8
1 parent 1856c28
commit 85db4c8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
@@ -42,6 +42,8 @@ public function validate($object)
         $data = $object->getData($attributeCode);
         if (is_array($data)) {
             $object->setData($attributeCode, implode(',', array_filter($data)));
+        } elseif (empty($data)) {
+            $object->setData($attributeCode, null);
         }
         return parent::validate($object);
     }

diff --git a/app/code/Magento/Ui/view/base/web/js/form/client.js b/app/code/Magento/Ui/view/base/web/js/form/client.js
@@ -22,7 +22,8 @@ define([
     function beforeSave(data, url, selectorPrefix, messagesClass) {
         var save = $.Deferred();
 
-        data = utils.serialize(data);
+        data = utils.filterFormData(data)
+        data = utils.serialize(utils.filterFormData(data));
 
         data['form_key'] = window.FORM_KEY;
 

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
@@ -13,7 +13,10 @@ define([
     return Select.extend({
         defaults: {
             size: 5,
-            elementTmpl: 'ui/form/element/multiselect'
+            elementTmpl: 'ui/form/element/multiselect',
+            listens: {
+                value: 'setDifferedFromDefault setPrepareToSendData'
+            }
         },
 
         /**
@@ -38,6 +41,15 @@ define([
             return _.isString(value) ? value.split(',') : value;
         },
 
+        setPrepareToSendData: function (data) {
+
+            if (!data.length) {
+                data = '';
+            }
+
+            this.source.set(this.dataScope + '-prepared-for-send', data);
+        },
+
         /**
          * @inheritdoc
          */

diff --git a/lib/web/mage/utils/misc.js b/lib/web/mage/utils/misc.js
@@ -209,6 +209,22 @@ define([
             return formData;
         },
 
+        filterFormData: function (data, sufix, separator) {
+            sufix = sufix || 'prepared-for-send';
+            separator = separator || '-';
+
+            _.each(data, function (value, key) {
+                if (_.isObject(value) && !value.length) {
+                    this.filterFormData(value, sufix, separator)
+                } else if (_.isString(key) && ~key.indexOf(sufix)) {
+                    data[key.split(separator)[0]] = value;
+                    delete data[key];
+                }
+            }, this);
+
+            return data;
+        },
+
         /**
          * Converts PHP IntlFormatter format to moment format.
          *