MC-41351: Cannot remove data using attribute with "File" type in admin area

mastiuhin-olexandr · mastiuhin-olexandr · commit 593df0f8a635 · 2021-03-26T22:10:47.000+02:00
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -320,10 +320,10 @@ public function compactValue($value)
         }
 
         // Remove outdated file (in the case of file uploader UI component)
-        if (!empty($this->_value) && !empty($value['delete'])) {
-            $this->fileProcessor->removeUploadedFile($this->_value);
-            return $value;
-        } else if ($this->_entityTypeCode == 'customer' && empty($value) && !empty($this->_value)) {
+        if (!empty($this->_value)
+            && (!empty($value['delete'])
+                || ($this->_entityTypeCode == 'customer' && empty($value)))
+        ) {
             $this->fileProcessor->removeUploadedFile($this->_value);
             return $value;
         }

Original file line number	Diff line number	Diff line change
`@@ -320,10 +320,10 @@ public function compactValue($value)`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`// Remove outdated file (in the case of file uploader UI component)`
`323`		`- if (!empty($this->_value) && !empty($value['delete'])) {`
`324`		`- $this->fileProcessor->removeUploadedFile($this->_value);`
`325`		`- return $value;`
`326`		`- } else if ($this->_entityTypeCode == 'customer' && empty($value) && !empty($this->_value)) {`
	`323`	`+ if (!empty($this->_value)`
	`324`	`+ && (!empty($value['delete'])`
	`325`	`+ \|\| ($this->_entityTypeCode == 'customer' && empty($value)))`
	`326`	`+ ) {`
`327`	`327`	`$this->fileProcessor->removeUploadedFile($this->_value);`
`328`	`328`	`return $value;`
`329`	`329`	`}`