Merge pull request #135 from benglass/master

Simplify breadcrumb code to allow for non-Menu MenuNode parents.

Author: dbu

Admin/MenuNodeAdmin.php

@@ -5,13 +5,15 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
 use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNode;
+use Symfony\Cmf\Bundle\MenuBundle\Model\Menu;
 use Knp\Menu\ItemInterface as MenuItemInterface;
 use Doctrine\Common\Util\ClassUtils;
 
 class MenuNodeAdmin extends AbstractMenuNodeAdmin
 {
     protected $baseRouteName = 'cmf_menu_menunode';
     protected $baseRoutePattern = '/cmf/menu/menunode';
+    protected $recursiveBreadcrumbs = true;
 
     /**
      * {@inheritDoc}
@@ -37,75 +39,39 @@ public function buildBreadcrumbs($action, MenuItemInterface $menu = null)
     {
         $menuNodeNode = parent::buildBreadcrumbs($action, $menu);
 
-        if ($action != 'edit') {
+        if ($action != 'edit' || ! $this->recursiveBreadcrumbs) {
             return $menuNodeNode;
         }
 
-        $menuDoc = $this->getMenuForSubject($this->getSubject());
+        $parentDoc = $this->getSubject()->getParent();
         $pool = $this->getConfigurationPool();
-        $menuAdmin = $pool->getAdminByClass(
-            ClassUtils::getClass($menuDoc)
+        $parentAdmin = $pool->getAdminByClass(
+            ClassUtils::getClass($parentDoc)
         );
-        $menuAdmin->setSubject($menuDoc);
-        $menuEditNode = $menuAdmin->buildBreadcrumbs($action, $menu);
-        if ($menuAdmin->isGranted('EDIT' && $menuAdmin->hasRoute('edit'))) {
-            $menuEditNode->setUri(
-                $menuAdmin->generateUrl('edit', array(
-                    'id' => $this->getUrlsafeIdentifier($menuDoc)
+
+        if (null === $parentAdmin) {
+            return $menuNodeNode;
+        }
+
+        $parentAdmin->setSubject($parentDoc);
+        $parentEditNode = $parentAdmin->buildBreadcrumbs($action, $menu);
+        if ($parentAdmin->isGranted('EDIT' && $parentAdmin->hasRoute('edit'))) {
+            $parentEditNode->setUri(
+                $parentAdmin->generateUrl('edit', array(
+                    'id' => $this->getUrlsafeIdentifier($parentDoc)
                 ))
             );
         }
 
         $menuNodeNode->setParent(null);
-        $current = $menuEditNode->addChild($menuNodeNode);
+        $current = $parentEditNode->addChild($menuNodeNode);
 
         return $current;
     }
 
-    protected function getMenuForSubject(MenuNode $subject)
+    public function setRecursiveBreadcrumbs($recursiveBreadcrumbs)
     {
-        $id = $subject->getId();
-
-        $menuId = $this->getMenuIdForNodeId($id);
-
-        $menu = $this->modelManager->find(null, $menuId);
-
-        return $menu;
+        $this->recursiveBreadcrumbs = (bool) $recursiveBreadcrumbs;
     }
 
-    protected function getMenuIdForNodeId($id)
-    {
-        // I wonder if this could be simplified in Phpcr/PathHelper
-        //
-        // $relPath = PathHelper::removeBasePath($this->menuRoot, $id);
-        // $menuId = PathHelper:splicePath($relPath, 0, 1);
-
-        if (0 !== strpos($id, $this->menuRoot)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Cannot find base path "%s" in menu node ID "%s"', $this->menuRoot, $id
-            ));
-        }
-
-        $relPath = substr($id, strlen($this->menuRoot) + 1);
-        $parts = explode('/', $relPath);
-
-        if (count($parts) == 0) {
-            throw new \InvalidArgumentException(sprintf(
-                'ID for menu node "%s" may not be the same as root path "%s"',
-                $id, $this->menuRoot
-            ));
-        }
-
-        if (count($parts) == 1) {
-            throw new \InvalidArgumentException(sprintf(
-                'MenuNode "%s" may not hold the position reserved for a Menu.',
-                $id
-            ));
-        }
-
-        $first = $parts[0];
-        $menuId = sprintf('%s/%s', $this->menuRoot, $first);
-
-        return $menuId;
-    }
 }

DependencyInjection/CmfMenuExtension.php

@@ -62,6 +62,7 @@ public function loadPhpcr($config, XmlFileLoader $loader, ContainerBuilder $cont
             'menu_basepath' => 'menu_basepath',
             'content_basepath' => 'content_basepath',
             'manager_name' => 'manager_name',
+            'admin_recursive_breadcrumbs' => 'admin_recursive_breadcrumbs',
         );
 
         foreach ($keys as $sourceKey => $targetKey) {

DependencyInjection/Configuration.php

@@ -34,6 +34,7 @@ public function getConfigTreeBuilder()
                                 ->scalarNode('menu_admin_class')->defaultNull()->end()
                                 ->scalarNode('node_admin_class')->defaultNull()->end()
                                 ->scalarNode('content_basepath')->defaultNull()->end()
+                                ->scalarNode('admin_recursive_breadcrumbs')->defaultTrue()->end()
                             ->end()
                         ->end()
                     ->end()

Resources/config/admin.xml

@@ -74,6 +74,10 @@
                 <argument type="service" id="cmf_menu.factory"/>>
             </call>
 
+            <call method="setRecursiveBreadcrumbs">
+                <argument>%cmf_menu.persistence.phpcr.admin_recursive_breadcrumbs%</argument>
+            </call>
+
         </service>
 
         <service id="cmf_menu.admin_extension.menu_node_referrers" class="%cmf_menu.admin_extension.menu_reference.class%">