MAGETWO-50123: Unable to assign blank value to attribute #3545 #4910 #5485

cpartica · cpartica · commit 2808b89e60e5 · 2016-08-17T14:21:10.000-05:00
- fixing code for code duplication as per code review
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -540,8 +540,9 @@ private function isProductNew()
      */
     private function isProductHasValueForAttribute(ProductAttributeInterface $attribute)
     {
-        return (bool)($this->locator->getProduct()->getCustomAttribute($attribute->getAttributeCode()) !== null)
-            && $this->locator->getProduct()->getCustomAttribute($attribute->getAttributeCode())->getValue();
+        /** @var \Magento\Framework\Api\AttributeInterface $attributeCode */
+        $attributeCode = $this->locator->getProduct()->getCustomAttribute($attribute->getAttributeCode());
+        return (bool)($attributeCode !== null) && $attributeCode->getValue();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -540,8 +540,9 @@ private function isProductNew()`
`540`	`540`	`*/`
`541`	`541`	`private function isProductHasValueForAttribute(ProductAttributeInterface $attribute)`
`542`	`542`	`{`
`543`		`- return (bool)($this->locator->getProduct()->getCustomAttribute($attribute->getAttributeCode()) !== null)`
`544`		`- && $this->locator->getProduct()->getCustomAttribute($attribute->getAttributeCode())->getValue();`
	`543`	`+ /** @var \Magento\Framework\Api\AttributeInterface $attributeCode */`
	`544`	`+ $attributeCode = $this->locator->getProduct()->getCustomAttribute($attribute->getAttributeCode());`
	`545`	`+ return (bool)($attributeCode !== null) && $attributeCode->getValue();`
`545`	`546`	`}`
`546`	`547`
`547`	`548`	`/**`