Merge pull request #133 from symfony-cmf/improve-admin

a root menu document can not be added anywhere in the tree, only at the root

Author: lsmith77

Admin/AbstractMenuNodeAdmin.php

@@ -34,15 +34,13 @@ protected function isSubjectNotNew()
         return $this->hasSubject() && null !== $this->getSubject()->getId();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
             ->with('form.group_general')
-                ->add(
-                    'parent',
-                    'doctrine_phpcr_odm_tree',
-                    array('root_node' => $this->menuRoot, 'choice_list' => array(), 'select_root_node' => true)
-                )
                 ->add('name', 'text',
                     $this->isSubjectNotNew() ? array(
                         'attr' => array('readonly' => 'readonly')

Admin/MenuAdmin.php

@@ -3,12 +3,16 @@
 namespace Symfony\Cmf\Bundle\MenuBundle\Admin;
 
 use Sonata\AdminBundle\Form\FormMapper;
+use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu;
 
 class MenuAdmin extends AbstractMenuNodeAdmin
 {
     protected $baseRouteName = 'cmf_menu';
     protected $baseRoutePattern = '/cmf/menu/menu';
 
+    /**
+     * {@inheritDoc}
+     */
     protected function configureFormFields(FormMapper $formMapper)
     {
         parent::configureFormFields($formMapper);
@@ -30,4 +34,13 @@ protected function configureFormFields(FormMapper $formMapper)
             ;
         }
     }
+
+    public function getNewInstance()
+    {
+        /** @var $new Menu */
+        $new = parent::getNewInstance();
+        $new->setParent($this->getModelManager()->find(null, $this->menuRoot));
+
+        return $new;
+    }
 }

Admin/MenuNodeAdmin.php

@@ -2,6 +2,7 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle\Admin;
 
+use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
 use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNode;
 use Knp\Menu\ItemInterface as MenuItemInterface;
@@ -12,6 +13,23 @@ class MenuNodeAdmin extends AbstractMenuNodeAdmin
     protected $baseRouteName = 'cmf_menu_menunode';
     protected $baseRoutePattern = '/cmf/menu/menunode';
 
+    /**
+     * {@inheritDoc}
+     */
+    protected function configureFormFields(FormMapper $formMapper)
+    {
+        $formMapper
+            ->with('form.group_general')
+                ->add(
+                    'parent',
+                    'doctrine_phpcr_odm_tree',
+                    array('root_node' => $this->menuRoot, 'choice_list' => array(), 'select_root_node' => true)
+                )
+            ->end()
+        ;
+        parent::configureFormFields($formMapper);
+    }
+
     /**
      * {@inheritDoc}
      */

Tests/WebTest/Admin/MenuAdminTest.php

@@ -50,7 +50,6 @@ public function testMenuCreate()
         $actionUrl = $node->getAttribute('action');
         $uniqId = substr(strchr($actionUrl, '='), 1);
 
-        $form[$uniqId.'[parent]'] = '/test/menus';
         $form[$uniqId.'[name]'] = 'foo-test';
         $form[$uniqId.'[label]'] = 'Foo Test';
 

Tests/WebTest/Admin/MenuNodeAdminTest.php

@@ -16,7 +16,7 @@ public function setUp()
 
     public function testEdit()
     {
-        $crawler = $this->client->request('GET', '/admin/cmf/menu/menunode/test/menus/test-menu/item-1/edit');
+        $this->client->request('GET', '/admin/cmf/menu/menunode/test/menus/test-menu/item-1/edit');
         $res = $this->client->getResponse();
         $this->assertEquals(200, $res->getStatusCode());
     }