Merge pull request #152 from WouterJ/tostring-patch

lsmith77 · lsmith77 · commit 4155c5438d3b · 2013-10-14T02:43:49.000-07:00
Fixing Admin#toString when creating document
diff --git a/Admin/AbstractMenuNodeAdmin.php b/Admin/AbstractMenuNodeAdmin.php
@@ -157,9 +157,10 @@ public function setContentTreeBlock($contentTreeBlock)
 
     public function toString($object)
     {
-        return $object instanceof MenuNodeBase && $object->getLabel()
-            ? $object->getLabel()
-            : parent::toString($object)
-            ;
+        if ($object instanceof MenuNodeBase && $object->getLabel()) {
+            return $object->getLabel();
+        }
+
+        return $object instanceof Menu ? 'menu' : 'menu item';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,10 @@ public function setContentTreeBlock($contentTreeBlock)`
`157`	`157`
`158`	`158`	`public function toString($object)`
`159`	`159`	`{`
`160`		`- return $object instanceof MenuNodeBase && $object->getLabel()`
`161`		`- ? $object->getLabel()`
`162`		`- : parent::toString($object)`
`163`		`- ;`
	`160`	`+ if ($object instanceof MenuNodeBase && $object->getLabel()) {`
	`161`	`+ return $object->getLabel();`
	`162`	`+ }`
	`163`	`+`
	`164`	`+ return $object instanceof Menu ? 'menu' : 'menu item';`
`164`	`165`	`}`
`165`	`166`	`}`