BUGFIX: Only show the subsites that you can actually access in the subsite tab of the group. (from r88952) (from r96296)

This commit is contained in:
Tom Rix 2010-03-01 22:07:41 +00:00
parent 7ae038ace2
commit 05c07fc824

View File

@ -54,7 +54,6 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
} }
} }
function updateCMSFields(&$fields) { function updateCMSFields(&$fields) {
if($this->owner->canEdit() ){ if($this->owner->canEdit() ){
// i18n tab // i18n tab
@ -208,7 +207,6 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
return $group; return $group;
} }
<<<<<<< .working
function providePermissions() { function providePermissions() {
return array( return array(
@ -220,15 +218,6 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
) )
); );
} }
=======
function providePermissions() {
return array(
'SECURITY_SUBSITE_GROUP' => 'Edit the subsite a group can access'
);
}
>>>>>>> .merge-right.r96288
} }
?> ?>