MINOR added a permission to manage who can edit the subsite a group is associated with (from r88849) (from r96288)

This commit is contained in:
Tom Rix 2010-03-01 22:03:55 +00:00
parent 414cdfc33c
commit dcf683ab33

View File

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