Merge pull request #149 from benglass/menu_admin_to_string

lsmith77 · lsmith77 · commit 33825d8f7045 · 2013-10-09T23:08:23.000-07:00
Add toString method to base menu node admin for displaying labels.
diff --git a/Admin/AbstractMenuNodeAdmin.php b/Admin/AbstractMenuNodeAdmin.php
@@ -17,6 +17,7 @@
 use Sonata\AdminBundle\Show\ShowMapper;
 use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
 use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNode;
+use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNodeBase;
 use Symfony\Cmf\Bundle\MenuBundle\ContentAwareFactory;
 
 /**
@@ -152,4 +153,12 @@ public function setContentTreeBlock($contentTreeBlock)
     {
         $this->contentTreeBlock = $contentTreeBlock;
     }
+
+    public function toString($object)
+    {
+        return $object instanceof MenuNodeBase && $object->getLabel()
+            ? $object->getLabel()
+            : parent::toString($object)
+            ;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`use Sonata\AdminBundle\Show\ShowMapper;`
`18`	`18`	`use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;`
`19`	`19`	`use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNode;`
	`20`	`+use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNodeBase;`
`20`	`21`	`use Symfony\Cmf\Bundle\MenuBundle\ContentAwareFactory;`
`21`	`22`
`22`	`23`	`/**`
`@@ -152,4 +153,12 @@ public function setContentTreeBlock($contentTreeBlock)`
`152`	`153`	`{`
`153`	`154`	`$this->contentTreeBlock = $contentTreeBlock;`
`154`	`155`	`}`
	`156`	`+`
	`157`	`+ public function toString($object)`
	`158`	`+ {`
	`159`	`+ return $object instanceof MenuNodeBase && $object->getLabel()`
	`160`	`+ ? $object->getLabel()`
	`161`	`+ : parent::toString($object)`
	`162`	`+ ;`
	`163`	`+ }`
`155`	`164`	`}`