fix error cannot load widget content

JaJuMa-GmbH · May 31, 2022 · ac92a4e · ac92a4e
1 parent 84593bf
commit ac92a4e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/Block/Widgets/Faq/Questions.php b/Block/Widgets/Faq/Questions.php
@@ -18,6 +18,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 use Magento\Widget\Model\Widget\Instance;
+use Magento\Widget\Helper\Conditions;
 
 class Questions extends Template
 {
@@ -46,6 +47,11 @@ class Questions extends Template
      */
     protected $coreRegistry;
 
+    /**
+     * @var Conditions
+     */
+    private $conditionsHelper;
+
     /**
      * Items constructor.
      * @param TemplateContext $context
@@ -61,13 +67,15 @@ public function __construct(
         Config $wysiwygConfig,
         Data $advancedWidgetHelper,
         Registry $coreRegistry,
+        Conditions $conditionsHelper,
         $data = []
     )
     {
         $this->elementFactory = $elementFactory;
         $this->wysiwygConfig = $wysiwygConfig;
         $this->advancedWidgetHelper = $advancedWidgetHelper;
         $this->coreRegistry = $coreRegistry;
+        $this->conditionsHelper = $conditionsHelper;
         parent::__construct($context, $data);
     }
 
@@ -183,4 +191,12 @@ public function getAdvancedWidgetHelper()
         return $this->advancedWidgetHelper;
     }
 
+    /**
+     * @return Data
+     */
+    public function getConditionsHelper()
+    {
+        return $this->conditionsHelper;
+    }
+
 }
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
@@ -8,10 +8,10 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Widget\Controller\Adminhtml\Widget\LoadOptions">
+    <!-- <type name="Magento\Widget\Controller\Adminhtml\Widget\LoadOptions">
         <plugin name="rewrite_widget_load_options"
                 type="Jajuma\HyvaFaq\Plugin\Widget\Controller\Adminhtml\Widget\LoadOptions"/>
-    </type>
+    </type> -->
 
     <type name="Magento\Backend\Model\Menu\Item">
         <plugin name="jajumaExtensionsLink" type="Jajuma\HyvaFaq\Plugin\Backend\Model\Menu\Item\ExtensionsLinkPlugin"/>

diff --git a/view/adminhtml/templates/widget/faq/questions.phtml b/view/adminhtml/templates/widget/faq/questions.phtml
@@ -8,7 +8,17 @@
 use Jajuma\AdvancedWidget\Block\Widgets\Faq\Questions; 
 /** @var Questions $block * */ 
 
-$questionsGroup = count($block->getWidgetContentValues()) ? ($block->getWidgetContentValues())['conditions'] : null;
+$contentValues = $block->getWidgetContentValues();
+if(count($contentValues)) {
+    if (array_key_exists('conditions',$contentValues)) {
+        $questionsGroup = $contentValues['conditions'];
+    } else {
+        $questionsGroup = $block->getConditionsHelper()->decode($contentValues['conditions_encoded']);
+    }
+} else {
+    $questionsGroup = null;
+}
+
 ?>
 <div class="admin__scope-old">
     <fieldset class="fieldset">