Merge pull request #7 from ubermanu/master

Fix URL to the insert image action
dmatthew · May 2, 2019 · 93ad05f · 93ad05f
2 parents c680319 + a5f8858
commit 93ad05f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+# Ignore IDE files
+/.idea
diff --git a/Block/Adminhtml/Widget/Type/ImageChooser.php b/Block/Adminhtml/Widget/Type/ImageChooser.php
@@ -17,8 +17,8 @@ class ImageChooser extends \Magento\Backend\Block\Template
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context, 
-        \Magento\Framework\Data\Form\Element\Factory $elementFactory, 
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Data\Form\Element\Factory $elementFactory,
         $data = []
     ) {
         $this->elementFactory = $elementFactory;
@@ -37,7 +37,7 @@ public function prepareElementHtml(AbstractElement $element)
         $config = $this->_getData('config');
         $onInsertUrl = $this->getUrl('dmatthew_widgets/wysiwyg_images/onInsert');
         $sourceUrl = $this->getUrl('cms/wysiwyg_images/index',
-            ['target_element_id' => $element->getId(), 'on_insert_url' => $onInsertUrl]);
+            ['target_element_id' => $element->getId(), 'on_insert_url' => urlencode($onInsertUrl)]);
 
         /** @var \Magento\Backend\Block\Widget\Button $chooser */
         $chooser = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Button')
@@ -46,7 +46,7 @@ public function prepareElementHtml(AbstractElement $element)
             ->setLabel($config['button']['open'])
             ->setOnClick('MediabrowserUtility.openDialog(\'' . $sourceUrl . '\', 0, 0, "Insert File...", {})')
             ->setDisabled($element->getReadonly());
-        
+
         /** @var \Magento\Framework\Data\Form\Element\Text $input */
         $input = $this->elementFactory->create("text", ['data' => $element->getData()]);
         $input->setId($element->getId());
@@ -55,11 +55,11 @@ public function prepareElementHtml(AbstractElement $element)
         if ($element->getRequired()) {
             $input->addClass('required-entry');
         }
-        
+
         $element->setData('after_element_html', $input->getElementHtml()
             . $chooser->toHtml() . "<script>require(['mage/adminhtml/browser']);</script>");
         $element->setValue('');  // Hides the additional label that gets added.
-        
+
         return $element;
     }
 }
diff --git a/Block/Plugin/Adminhtml/Wysiwyg/Images/Content.php b/Block/Plugin/Adminhtml/Wysiwyg/Images/Content.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Dmatthew\WidgetParameters\Block\Plugin\Adminhtml\Wysiwyg\Images;
 
 class Content
@@ -8,13 +9,26 @@ class Content
      */
     private $request;
 
+    /**
+     * Content constructor.
+     *
+     * @param \Magento\Framework\App\RequestInterface $request
+     */
     public function __construct(\Magento\Framework\App\RequestInterface $request)
     {
         $this->request = $request;
     }
 
+    /**
+     * @param \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content $subject
+     * @param                                                     $result
+     *
+     * @return string
+     */
     public function afterGetOnInsertUrl(\Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content $subject, $result)
     {
-        return $this->request->getParam('on_insert_url') ?: $result;
+        $onInsertUrl = $this->request->getParam('on_insert_url');
+
+        return $onInsertUrl ? urldecode($onInsertUrl) : $result;
     }
 }