Merge pull request #5 from magento-goinc/MAGETWO-45172

MAGETWO-45172

Author: kandy

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

@@ -26,23 +26,31 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $productTypeManager;
 
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     */
+    protected $productRepository;
+
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
      * @param Initialization\Helper $initializationHelper
      * @param \Magento\Catalog\Model\Product\Copier $productCopier
      * @param \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager
+     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         Product\Builder $productBuilder,
         Initialization\Helper $initializationHelper,
         \Magento\Catalog\Model\Product\Copier $productCopier,
-        \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager
+        \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager,
+        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
     ) {
         $this->initializationHelper = $initializationHelper;
         $this->productCopier = $productCopier;
         $this->productTypeManager = $productTypeManager;
+        $this->productRepository = $productRepository;
         parent::__construct($context, $productBuilder);
     }
 
@@ -74,6 +82,7 @@ public function execute()
 
                 $originalSku = $product->getSku();
                 $product->save();
+                $this->handleImageRemoveError($data, $product->getId());
                 $productId = $product->getId();
                 $productAttributeSetId = $product->getAttributeSetId();
                 $productTypeId = $product->getTypeId();
@@ -147,4 +156,33 @@ public function execute()
         }
         return $resultRedirect;
     }
+
+    /**
+     * Notify customer when image was not deleted in specific case.
+     * TODO: temporary workaround must be eliminated in MAGETWO-45306
+     *
+     * @param array $postData
+     * @param int $productId
+     * @return void
+     */
+    private function handleImageRemoveError($postData, $productId)
+    {
+        if (isset($postData['product']['media_gallery']['images'])) {
+            $removedImagesAmount = 0;
+            foreach ($postData['product']['media_gallery']['images'] as $image) {
+                if (!empty($image['removed'])) {
+                    $removedImagesAmount++;
+                }
+            }
+            if ($removedImagesAmount) {
+                $expectedImagesAmount = count($postData['product']['media_gallery']['images']) - $removedImagesAmount;
+                $product = $this->productRepository->getById($productId);
+                if ($expectedImagesAmount != count($product->getMediaGallery('images'))) {
+                    $this->messageManager->addNotice(
+                        __('The image cannot be removed as it has been assigned to the other image role')
+                    );
+                }
+            }
+        }
+    }
 }

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

@@ -1505,11 +1505,11 @@ public function getMediaGalleryImages()
         if (!$this->hasData('media_gallery_images') && is_array($this->getMediaGallery('images'))) {
             $images = $this->_collectionFactory->create();
             foreach ($this->getMediaGallery('images') as $image) {
-                if (isset($image['disabled']) && $image['disabled']) {
+                if ((isset($image['disabled']) && $image['disabled']) || empty($image['value_id'])) {
                     continue;
                 }
                 $image['url'] = $this->getMediaConfig()->getMediaUrl($image['file']);
-                $image['id'] = !empty($image['value_id']) ? $image['value_id'] : null;
+                $image['id'] = $image['value_id'];
                 $image['path'] = $directory->getAbsolutePath($this->getMediaConfig()->getMediaPath($image['file']));
                 $images->addItem(new \Magento\Framework\DataObject($image));
             }