Clean up bundle for treeBrowser

billsworld · May 5, 2015 · 788e97a · 788e97a
1 parent c274a96
commit 788e97a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 497 deletions.
diff --git a/Controller/TreeController.php b/Controller/TreeController.php
@@ -77,7 +77,6 @@ public function treeAction(Request $request)
         return $this->render($this->template, array(
             'repository_name' => $this->repositoryName,
             'root_node' => $root,
-            //'selected_node' => $selected,
             'routing_defaults' => $this->defaults,
             //'confirm_move' => $this->confirmMove,
             //'create_in_overlay' => $createInOverlay ? $createInOverlay : false,

diff --git a/Form/Type/TreeManagerType.php b/Form/Type/TreeManagerType.php
@@ -25,9 +25,9 @@ class TreeManagerType extends AbstractType
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['root'] = $options['root'];
-        $view->vars['create_in_overlay'] = $options['create_in_overlay'];
-        $view->vars['edit_in_overlay'] = $options['edit_in_overlay'];
-        $view->vars['delete_in_overlay'] = $options['delete_in_overlay'];
+        //$view->vars['create_in_overlay'] = $options['create_in_overlay'];
+        //$view->vars['edit_in_overlay'] = $options['edit_in_overlay'];
+        //$view->vars['delete_in_overlay'] = $options['delete_in_overlay'];
         parent::buildView($view, $form, $options);
     }
 

diff --git a/Form/Type/TreeModelType.php b/Form/Type/TreeModelType.php
@@ -31,11 +31,6 @@ class TreeModelType extends AbstractType
      */
     protected $defaults = array();
 
-    /**
-     * @var TreeInterface
-     */
-    protected $tree;
-
     /**
      * @param array $defaults
      */
@@ -44,14 +39,6 @@ public function setDefaults(array $defaults)
         $this->defaults = $defaults;
     }
 
-    /**
-     * @param TreeInterface $tree
-     */
-    public function setTree(TreeInterface $tree)
-    {
-        $this->tree = $tree;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -68,8 +55,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        parent::buildView($view, $form, $options);
-        $view->vars['tree'] = $this->tree;
         $view->vars['root_node'] = $form->getConfig()->getAttribute('root_node');
         $view->vars['select_root_node'] = $form->getConfig()->getAttribute('select_root_node');
         $view->vars['repository_name'] = $form->getConfig()->getAttribute('repository_name');

diff --git a/Resources/config/doctrine_phpcr_form_types.xml b/Resources/config/doctrine_phpcr_form_types.xml
@@ -10,9 +10,6 @@
             <call method="setDefaults">
                 <argument>%sonata_admin_doctrine_phpcr.tree_block.defaults%</argument>
             </call>
-            <call method="setTree">
-                <argument type="service" id="sonata.admin.doctrine_phpcr.phpcr_odm_tree" />
-            </call>
         </service>
 
         <service id="sonata.admin.doctrine_phpcr.form.type.phpcr_odm_tree_manager" class="Sonata\DoctrinePHPCRAdminBundle\Form\Type\TreeManagerType">

diff --git a/Resources/views/Form/form_admin_fields.html.twig b/Resources/views/Form/form_admin_fields.html.twig
@@ -148,7 +148,16 @@ file that was distributed with this source code.
 {% include 'CmfTreeBrowserBundle:Base:tree.html.twig' %}
 <script>
     jQuery(function ($) {
-        var defaults = {% include 'SonataDoctrinePHPCRAdminBundle:Tree:routing_defaults.html.twig' with {'routing_defaults': routing_defaults} %};
+        {% set routing_default_values = {} %}
+        {% for default in routing_defaults %}
+            {% if 'locale' == default %}
+                {% set routing_default_values = routing_default_values|merge({'_locale': app.request.locale}) %}
+            {% elseif 'format' == default %}
+                {% set routing_default_values = routing_default_values|merge({'_format': app.request.format}) %}
+            {% else %}
+                {% set routing_default_values = routing_default_values|merge({default: app.request.attributes.get(default)}) %}
+            {% endif %}
+        {% endfor %}
 
         $('#{{ id }}-tree-selector').cmfTree({
             request: {
@@ -157,8 +166,7 @@ file that was distributed with this source code.
                         url: '{{ path('_cmf_resource', {
                             repositoryName: repository_name,
                             path: '__path__'
-                        }) }}'.replace('__path__', nodePath)
-                        {# todo: include routing defaults #}
+                        }|merge(routing_default_values)) }}'.replace('__path__', nodePath)
                     };
                 },
             },
@@ -179,11 +187,12 @@ file that was distributed with this source code.
 {% block doctrine_phpcr_odm_tree_manager_widget %}
     {{ render(controller('sonata.admin.doctrine_phpcr.tree_controller:treeAction', {
         'root': form.vars.root,
-        'selected': false,
+    })) }}
+    {#    'selected': false,
         'create_in_overlay': form.vars.create_in_overlay,
         'edit_in_overlay': form.vars.edit_in_overlay,
         'delete_in_overlay': form.vars.delete_in_overlay
-    })) }}
+    })) #}
 {% endblock %}
 
 {% block choice_field_mask_widget %}