diff --git a/security/Group.php b/security/Group.php index c501823ff..0e0f411b2 100644 --- a/security/Group.php +++ b/security/Group.php @@ -278,6 +278,14 @@ class Group extends DataObject { || (Member::currentUserID() && !DataObject::get("Permission", "GroupID = $this->ID AND Code = 'ADMIN'")); } } + + public function canView() { + if($this->hasMethod('alternateCanView')) return $this->alternateCanView(); + else { + return Permission::check("ADMIN") + || (Member::currentUserID() && !DataObject::get("Permission", "GroupID = $this->ID AND Code = 'ADMIN'")); + } + } /** * Returns all of the children for the CMS Tree. @@ -288,7 +296,7 @@ class Group extends DataObject { $filteredChildren = new DataObjectSet(); if($children) foreach($children as $child) { - if($child->canEdit()) $filteredChildren->push($child); + if($child->can()) $filteredChildren->push($child); } return $filteredChildren;