tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #271 from halkyon/group_changes

Browse Source 
BUGFIX Nested Group records should be removed, along with the parent.
This commit is contained in:
Ingo Schommer 2012-03-28 02:52:52 -07:00
commit d0d23dc591
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/Group.php
View File

@ -338,12 +338,16 @@ class Group extends DataObject {
}
}
function onAfterDelete() {
parent::onAfterDelete();
function onBeforeDelete() {
parent::onBeforeDelete();
// if deleting this group, delete it's children as well
foreach($this->Groups() as $group) {
$group->delete();
}
// Delete associated permissions
$permissions = $this->Permissions();
foreach ( $permissions as $permission ) {
foreach($this->Permissions() as $permission) {
$permission->delete();
}
}

22
tests/security/GroupTest.php
View File

@ -94,15 +94,6 @@ class GroupTest extends FunctionalTest {
}
function testDelete() {
$adminGroup = $this->objFromFixture('Group', 'admingroup');
$adminGroup->delete();
$this->assertEquals(0, DataObject::get('Group', "\"ID\"={$adminGroup->ID}")->count(), 'Group is removed');
$this->assertEquals(0, DataObject::get('Permission',"\"GroupID\"={$adminGroup->ID}")->count(), 'Permissions removed along with the group');
}
function testCollateAncestorIDs() {
$parentGroup = $this->objFromFixture('Group', 'parentgroup');
$childGroup = $this->objFromFixture('Group', 'childgroup');
@ -128,6 +119,19 @@ class GroupTest extends FunctionalTest {
'Orphaned nodes dont contain invalid parent IDs'
);
}
public function testDelete() {
$group = $this->objFromFixture('Group', 'parentgroup');
$groupID = $group->ID;
$childGroupID = $this->idFromFixture('Group', 'childgroup');
$group->delete();
$this->assertEquals(0, DataObject::get('Group', "\"ID\" = {$groupID}")->Count(), 'Group is removed');
$this->assertEquals(0, DataObject::get('Permission', "\"GroupID\" = {$groupID}")->Count(), 'Permissions removed along with the group');
$this->assertEquals(0, DataObject::get('Group', "\"ParentID\" = {$groupID}")->Count(), 'Child groups are removed');
$this->assertEquals(0, DataObject::get('Group', "\"ParentID\" = {$childGroupID}")->Count(), 'Grandchild groups are removed');
}
}
class GroupTest_Member extends Member implements TestOnly {

3
tests/security/GroupTest.yml
View File

@ -6,6 +6,9 @@ Group:
childgroup:
Code: childgroup
Parent: =>Group.parentgroup
grandchildgroup:
Code: grandchildgroup
Parent: =>Group.childgroup
group1:
Title: Group 1
group2: