Merge remote-tracking branch 'origin/MAGETWO-52737' into Troll-PR

Author: rganin

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -82,8 +82,15 @@ protected function _filterCategoryPostData(array $rawData)
         $data = $rawData;
         // @todo It is a workaround to prevent saving this data in category model and it has to be refactored in future
         if (isset($data['image']) && is_array($data['image'])) {
-            $data['image_additional_data'] = $data['image'];
-            unset($data['image']);
+            if (!empty($data['image']['delete'])) {
+                $data['image'] = null;
+            } else {
+                if (isset($data['image'][0]['name']) && isset($data['image'][0]['tmp_name'])) {
+                    $data['image'] = $data['image'][0]['name'];
+                } else {
+                    unset($data['image']);
+                }
+            }
         }
         return $data;
     }

app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -94,26 +94,14 @@ private function getImageUploader()
      */
     public function afterSave($object)
     {
-        $value = $object->getData($this->getAttribute()->getName() . '_additional_data');
+        $image = $object->getData($this->getAttribute()->getName(), null);
 
-        if (is_array($value) && !empty($value['delete'])) {
-            $object->setData($this->getAttribute()->getName(), '');
-            $this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
-            return $this;
-        }
-
-        if (isset($value[0]['name']) && isset($value[0]['tmp_name'])) {
+        if ($image !== null) {
             try {
-                $result = $this->getImageUploader()->moveFileFromTmp($value[0]['name']);
-
-                $object->setData($this->getAttribute()->getName(), $result);
-                $this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
+                $this->getImageUploader()->moveFileFromTmp($image);
             } catch (\Exception $e) {
                 $this->_logger->critical($e);
             }
-        } elseif (isset($value[0]['name'])) {
-            $object->setData($this->getAttribute()->getName(), $value[0]['name']);
-            $this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
         }
         return $this;
     }

app/code/Magento/Catalog/Model/CategoryRepository.php

@@ -91,8 +91,15 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
             );
 
             if (isset($existingData['image']) && is_array($existingData['image'])) {
-                $existingData['image_additional_data'] = $existingData['image'];
-                unset($existingData['image']);
+                if (!empty($existingData['image']['delete'])) {
+                    $existingData['image'] = null;
+                } else {
+                    if (isset($existingData['image'][0]['name']) && isset($existingData['image'][0]['tmp_name'])) {
+                        $existingData['image'] = $existingData['image'][0]['name'];
+                    } else {
+                        unset($existingData['image']);
+                    }
+                }
             }
         } else {
             $parentId = $category->getParentId() ?: $this->storeManager->getStore()->getRootCategoryId();

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php

@@ -433,7 +433,7 @@ public function testExecute($categoryId, $storeId, $parentId)
             ->method('getPostValue')
             ->willReturn($postData);
         $addData = $postData;
-        $addData['image_additional_data'] = ['delete' => true];
+        $addData['image'] = ['delete' => true];
         $categoryMock->expects($this->once())
             ->method('addData')
             ->with($addData);

app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php

@@ -173,7 +173,6 @@ public function filterExtraFieldsOnUpdateCategoryDataProvider()
                 ['level' => '1', 'path' => '1/2', 'image' => ['categoryImage'], 'name' => 'category'],
                 [
                     'store_id' => 1,
-                    'image_additional_data' => ['categoryImage'],
                     'name' => 'category',
                     'entity_id' => null
                 ]