MAGETWO-66442: Changes in default scope not effect product images in other scopes

Oleksandr_Hodzevych · Oleksandr_Hodzevych · commit 11cd40ea7650 · 2018-08-20T18:35:26.000+03:00
- Fixed delete images for all store views and add tooltip when hover on delete button
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
@@ -31,7 +31,7 @@ protected function processDeletedImages($product, array &$images)
 
         foreach ($images as &$image) {
             if (!empty($image['removed'])) {
-                if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
+                if (!empty($image['value_id'])) {
                     if (preg_match('/\.\.(\\\|\/)/', $image['file'])) {
                         continue;
                     }
diff --git a/app/code/Magento/ProductVideo/i18n/de_DE.csv b/app/code/Magento/ProductVideo/i18n/de_DE.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/en_US.csv b/app/code/Magento/ProductVideo/i18n/en_US.csv
@@ -40,3 +40,4 @@ Delete,Delete
 "Autostart base video","Autostart base video"
 "Show related video","Show related video"
 "Auto restart video","Auto restart video"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/es_ES.csv b/app/code/Magento/ProductVideo/i18n/es_ES.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/fr_FR.csv b/app/code/Magento/ProductVideo/i18n/fr_FR.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/nl_NL.csv b/app/code/Magento/ProductVideo/i18n/nl_NL.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/pt_BR.csv b/app/code/Magento/ProductVideo/i18n/pt_BR.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv b/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Magento_ProductVideo::css/gallery-delete-tooltip.css"/>
+    </head>
     <body>
         <referenceContainer name="content">
 
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
@@ -140,30 +140,37 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                      alt="<%- data.label %>"/>
 
                 <div class="actions">
-                    <button type="button"
-                            class="action-remove"
-                            data-role="delete-button"
-                            title="<% if (data.media_type == 'external-video') {%>
+                    <div class="tooltip">
+                        <span class="delete-tooltiptext">
+                            <?= $block->escapeHtml(
+                                __('Delete image in all store views')
+                            ); ?>
+                        </span>
+                        <button type="button"
+                                class="action-remove"
+                                data-role="delete-button"
+                                title="<% if (data.media_type == 'external-video') {%>
+                                <?= $block->escapeHtml(
+                                    __('Delete video')
+                                ); ?>
+                            <%} else {%>
+                                <?= $block->escapeHtml(
+                                    __('Delete image')
+                                ); ?>
+                            <%}%>">
+                        <span>
+                            <% if (data.media_type == 'external-video') { %>
                             <?= $block->escapeHtml(
                                 __('Delete video')
                             ); ?>
-                        <%} else {%>
+                            <% } else {%>
                             <?= $block->escapeHtml(
                                 __('Delete image')
                             ); ?>
-                        <%}%>">
-                    <span>
-                        <% if (data.media_type == 'external-video') { %>
-                        <?= $block->escapeHtml(
-                            __('Delete video')
-                        ); ?>
-                        <% } else {%>
-                        <?= $block->escapeHtml(
-                            __('Delete image')
-                        ); ?>
-                        <%} %>
-                    </span>
-                    </button>
+                            <%} %>
+                        </span>
+                        </button>
+                    </div>
                     <div class="draggable-handle"></div>
                 </div>
                 <div class="image-fade"><span><?= $block->escapeHtml(
@@ -329,4 +336,4 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
 </div>
 <script>
     jQuery('body').trigger('contentUpdated');
-</script>
+</script>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css b/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+.gallery .tooltip .delete-tooltiptext {
+    visibility: hidden;
+    width: 112px;
+    background-color: #373330;
+    color: #F7F3EB;
+    text-align: center;
+    padding: 5px 0;
+    position: absolute;
+    z-index: 1;
+    left: 30px;
+    top: 91px;
+}
+
+.gallery .tooltip:hover .delete-tooltiptext {
+    visibility: visible;
+}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected function processDeletedImages($product, array &$images)`
`31`	`31`
`32`	`32`	`foreach ($images as &$image) {`
`33`	`33`	`if (!empty($image['removed'])) {`
`34`		`- if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {`
	`34`	`+ if (!empty($image['value_id'])) {`
`35`	`35`	`if (preg_match('/\.\.(\\\\|\/)/', $image['file'])) {`
`36`	`36`	`continue;`
`37`	`37`	`}`