Merge pull request #76 from gl005/2.3

Made the changes of patch 2.5.1 available in 2.3
helios-ag · Oct 29, 2014 · 4834631 · 4834631
2 parents bfb870d + 6a74e35
commit 4834631
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Controller/ElFinderController.php b/Controller/ElFinderController.php
@@ -23,7 +23,7 @@ public function showAction($instance)
     {
         $efParameters = $this->container->getParameter('fm_elfinder');
         $parameters = $efParameters['instances'][$instance];
-        $result = $this->selectEditor($parameters, $instance);
+        $result = $this->selectEditor($parameters, $instance, $this->getRequest()->get("id"));
 
         return $this->render($result['template'], $result['params']);
     }
@@ -33,7 +33,7 @@ public function showAction($instance)
      * @param $instance
      * @return array
      */
-    private function selectEditor($parameters, $instance)
+    private function selectEditor($parameters, $instance, $formTypeId = null)
     {
         $editor = $parameters['editor'];
         $locale = $parameters['locale'] ?: $this->container->getParameter('locale');
@@ -76,7 +76,8 @@ private function selectEditor($parameters, $instance)
                     'locale' => $locale,
                     'fullscreen' => $fullscreen,
                     'includeAssets' => $includeAssets,
-                    'instance' => $instance
+                    'instance' => $instance,
+                    'id'=>$formTypeId
                 );
                 return $result;
             default:

diff --git a/Resources/views/Elfinder/elfinder_type.html.twig b/Resources/views/Elfinder/elfinder_type.html.twig
@@ -15,7 +15,7 @@
             url : '{{path('ef_connect', { 'instance': instance } )}}',
             lang : '{{locale}}',
             getFileCallback: function(file) {
-                window.opener.setValue(file.path);
+                window.opener.setValue(file.path, "{{ id }}");
                 window.close();
             }
         });

diff --git a/Resources/views/Form/elfinder_widget.html.twig b/Resources/views/Form/elfinder_widget.html.twig
@@ -2,11 +2,11 @@
     <input type="text" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %} data-type="elfinder-input-field" />
     {% if enable and instance is defined %}
         <script type="text/javascript" charset="utf-8">
-            $('[data-type="elfinder-input-field"]').on("click",function() {
-                var childWin = window.open("{{path('elfinder', {'instance': instance })}}", "popupWindow", "height=450, width=900");
+            $('[data-type="elfinder-input-field"][id="{{ id }}"]').on("click",function() {
+                var childWin = window.open("{{path('elfinder', {'instance': instance })}}?id={{ id }}", "popupWindow", "height=450, width=900");
             });
-            function setValue(value) {
-                $('[data-type="elfinder-input-field"]').val(value);
+            function setValue(value, element_id) {
+                $('[data-type="elfinder-input-field"]'+ (element_id ? '[id="'+ element_id +'"]': '')).val(value);
             }
         </script>
     {% endif %}