ENGCOM-4584: Fix broken widget placeholders after upgrading from 2.2 #…

…19987
magento · Apr 5, 2019 · d831f53 · d831f53
2 parents 7198662 + 779200e
commit d831f53
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
@@ -248,17 +248,13 @@ public function getWidgets($filters = [])
         $result = $widgets;
 
         // filter widgets by params
-        if (is_array($filters) && count($filters) > 0) {
+        if (is_array($filters) && !empty($filters)) {
             foreach ($widgets as $code => $widget) {
-                try {
-                    foreach ($filters as $field => $value) {
-                        if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
-                            throw new \Exception();
-                        }
+                foreach ($filters as $field => $value) {
+                    if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
+                        unset($result[$code]);
+                        break;
                     }
-                } catch (\Exception $e) {
-                    unset($result[$code]);
-                    continue;
                 }
             }
         }
@@ -323,8 +319,6 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
 
         $directive .= $this->getWidgetPageVarName($params);
 
-        $directive .= sprintf(' type_name="%s"', $widget['name']);
-
         $directive .= '}}';
 
         if ($asIs) {

diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -120,6 +120,7 @@ public function getWidgetPlaceholderImageUrls()
 
     /**
      * Return url to error image
+     *
      * @return string
      */
     public function getErrorImageUrl()
@@ -129,6 +130,7 @@ public function getErrorImageUrl()
 
     /**
      * Return url to wysiwyg plugin
+     *
      * @return string
      */
     public function getWysiwygJsPluginSrc()
@@ -157,7 +159,7 @@ public function getWidgetWindowUrl($config)
             }
         }
 
-        if (count($skipped) > 0) {
+        if (!empty($skipped)) {
             $params['skip_widgets'] = $this->encodeWidgetsToQuery($skipped);
         }
         return $this->_backendUrl->getUrl('adminhtml/widget/index', $params);
@@ -189,6 +191,8 @@ public function decodeWidgetsFromQuery($queryParam)
     }
 
     /**
+     * Get available widgets.
+     *
      * @param \Magento\Framework\DataObject $config Editor element config
      * @return array
      */
@@ -202,7 +206,7 @@ public function getAvailableWidgets($config)
                 if (is_array($skipped) && in_array($widget['type'], $skipped)) {
                     continue;
                 }
-                $result[] = $widget['name']->getText();
+                $result[$widget['type']] = $widget['name']->getText();
             }
         }
 

diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
@@ -224,7 +224,6 @@ public function testGetWidgetDeclaration()
         $this->assertContains('title="my &quot;widget&quot;"', $result);
         $this->assertContains('conditions_encoded="encoded-conditions-string"', $result);
         $this->assertContains('page_var_name="pasdf"', $result);
-        $this->assertContains('type_name=""}}', $result);
     }
 
     /**
@@ -275,7 +274,6 @@ public function testGetWidgetDeclarationWithZeroValueParam()
         );
         $this->assertContains('{{widget type="Magento\CatalogWidget\Block\Product\ProductsList"', $result);
         $this->assertContains('page_var_name="pasdf"', $result);
-        $this->assertContains('type_name=""}}', $result);
         $this->assertContains('products_count=""', $result);
     }
 }
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -132,7 +132,7 @@ define([
                         attributes.type = attributes.type.replace(/\\\\/g, '\\');
                         imageSrc = config.placeholders[attributes.type];
 
-                        if (config.types.indexOf(attributes['type_name']) > -1) {
+                        if (imageSrc) {
                             imageHtml += '<span class="magento-placeholder magento-widget mceNonEditable" ' +
                                 'contenteditable="false">';
                         } else {
@@ -147,8 +147,8 @@ define([
                         imageHtml += ' src="' + imageSrc + '"';
                         imageHtml += ' />';
 
-                        if (attributes['type_name']) {
-                            imageHtml += attributes['type_name'];
+                        if (config.types[attributes.type]) {
+                            imageHtml += config.types[attributes.type];
                         }
 
                         imageHtml += '</span>';