Merge pull request #471 from sonata-project/missing_parameter

Missing parameter
sonata-project · Jul 28, 2017 · a333080 · a333080
2 parents f054065 + 0991400
commit a333080
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/src/Controller/TreeController.php b/src/Controller/TreeController.php
@@ -76,7 +76,7 @@ public function treeAction(Request $request)
 
         return $this->render($this->template, array(
             'root_node' => $root,
-            'routing_defaults' => $this->treeConfiguration['routing_default'],
+            'routing_defaults' => $this->treeConfiguration['routing_defaults'],
             'repository_name' => $this->treeConfiguration['repository_name'],
             'reorder' => $this->treeConfiguration['reorder'],
             'move' => $this->treeConfiguration['move'],

diff --git a/src/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php b/src/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php
@@ -101,5 +101,9 @@ private function loadDocumentTree($config, ContainerBuilder $container)
         );
 
         $container->setParameter('sonata_admin_doctrine_phpcr.tree_block.configuration', $configuration);
+
+        foreach ($configuration as $key => $value) {
+            $container->setParameter('sonata_admin_doctrine_phpcr.tree_block.'.$key, $value);
+        }
     }
 }
diff --git a/src/Resources/config/block.xml b/src/Resources/config/block.xml
@@ -8,7 +8,7 @@
             <tag name="sonata.block"/>
             <argument>sonata_admin_doctrine_phpcr.tree_block</argument>
             <argument type="service" id="templating"/>
-            <argument>%sonata_admin_doctrine_phpcr.tree_block.defaults%</argument>
+            <argument>%sonata_admin_doctrine_phpcr.tree_block.routing_defaults%</argument>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/doctrine_phpcr_form_types.xml b/src/Resources/config/doctrine_phpcr_form_types.xml
@@ -4,7 +4,7 @@
         <service id="sonata.admin.doctrine_phpcr.form.type.phpcr_odm_tree" class="Sonata\DoctrinePHPCRAdminBundle\Form\Type\TreeModelType">
             <tag name="form.type" alias="doctrine_phpcr_odm_tree"/>
             <call method="setDefaults">
-                <argument>%sonata_admin_doctrine_phpcr.tree_block.defaults%</argument>
+                <argument>%sonata_admin_doctrine_phpcr.tree_block.routing_defaults%</argument>
             </call>
         </service>
         <service id="sonata.admin.doctrine_phpcr.form.type.phpcr_odm_tree_manager" class="Sonata\DoctrinePHPCRAdminBundle\Form\Type\TreeManagerType">

diff --git a/tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php b/tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php
@@ -41,5 +41,26 @@ public function testDocumentTreeDefaultValues()
                 'reorder' => true,
             )
         );
+
+        $this->assertContainerBuilderHasParameter(
+            'sonata_admin_doctrine_phpcr.tree_block.routing_defaults',
+            array()
+        );
+        $this->assertContainerBuilderHasParameter(
+            'sonata_admin_doctrine_phpcr.tree_block.repository_name',
+            null
+        );
+        $this->assertContainerBuilderHasParameter(
+            'sonata_admin_doctrine_phpcr.tree_block.sortable_by',
+            'position'
+        );
+        $this->assertContainerBuilderHasParameter(
+            'sonata_admin_doctrine_phpcr.tree_block.move',
+            true
+        );
+        $this->assertContainerBuilderHasParameter(
+            'sonata_admin_doctrine_phpcr.tree_block.reorder',
+            true
+        );
     }
 }