Fix OwnerPermissionedDataObject relation class, Add new nav control methods to ChildlessPage and NavHolderPage

Author: Matthew Hailwood

code/OwnerPermissionedDataObject.php

@@ -14,8 +14,8 @@ class OwnerPermissionedDataObject extends DataObject {
 	 * @return DataObject
 	 */
 	protected function RelationOwner() {
-		if ($this->hasMethod(self::$relationOwnerMethod)) {
-			return $this->{self::$relationOwnerMethod}();
+		if ($this->hasMethod(static::$relationOwnerMethod)) {
+			return $this->{static::$relationOwnerMethod}();
 		} else {
 			throw new BadMethodCallException(
 				sprintf('Method "%s" not found - Is %s::$relationOwnerMethod correct?', self::$relationOwnerMethod, get_class($this))
@@ -38,4 +38,4 @@ public function canDelete($member = null) {
 	public function canCreate($member = null) {
 		return $this->RelationOwner()->canCreate($member);
 	}
-}
+}

code/PageTypes/ChildlessPage.php

@@ -12,6 +12,14 @@
  */
 class ChildlessPage extends Page {
 
+	/**
+	 * Set to return true if this page should not show it's children in the nav
+	 *
+	 * @return bool
+	 */
+	public function HideChildrenFromNavigation() {
+		return true;
+	}
 }
 
 

code/PageTypes/NavHolderPage.php

@@ -13,6 +13,14 @@
  */
 class NavHolderPage extends Page {
 
+	/**
+	 * Set to return false if this page should not be added to as the first child of it's dropdown list if it is a parent
+	 *
+	 * @return bool
+	 */
+	public function ShowInDropdownIfParent(){
+		return false;
+	}
 }