MAGETWO-70036: Change EAV attribute value validation

zakdma · zakdma · commit 3e9d8e327217 · 2017-06-27T15:55:59.000+03:00
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
@@ -38,13 +38,16 @@ public function beforeSave($object)
      */
     public function validate($object)
     {
-        $attributeCode = $this->getAttribute()->getAttributeCode();
+        $attribute = $this->getAttribute();
+        $attributeCode = $attribute->getAttributeCode();
         $data = $object->getData($attributeCode);
+        $assigned = $object->hasData($attributeCode);
         if (is_array($data)) {
             $object->setData($attributeCode, implode(',', array_filter($data)));
-        } elseif (empty($data)) {
+        } elseif (empty($data) && $assigned) {
             $object->setData($attributeCode, null);
         }
+
         return parent::validate($object);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,16 @@ public function beforeSave($object)`
`38`	`38`	`*/`
`39`	`39`	`public function validate($object)`
`40`	`40`	`{`
`41`		`- $attributeCode = $this->getAttribute()->getAttributeCode();`
	`41`	`+ $attribute = $this->getAttribute();`
	`42`	`+ $attributeCode = $attribute->getAttributeCode();`
`42`	`43`	`$data = $object->getData($attributeCode);`
	`44`	`+ $assigned = $object->hasData($attributeCode);`
`43`	`45`	`if (is_array($data)) {`
`44`	`46`	`$object->setData($attributeCode, implode(',', array_filter($data)));`
`45`		`- } elseif (empty($data)) {`
	`47`	`+ } elseif (empty($data) && $assigned) {`
`46`	`48`	`$object->setData($attributeCode, null);`
`47`	`49`	`}`
	`50`	`+`
`48`	`51`	`return parent::validate($object);`
`49`	`52`	`}`
`50`	`53`	`}`