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

Merge pull request #7798 from kinglozzer/member-groupset-delete

Browse Source 
FIX: Fix Member_GroupSet::removeAll() (fixes #3948)
This commit is contained in:
Damian Mooyman 2018-01-25 09:20:30 +13:00 committed by GitHub
commit 72e2326731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
security/Member.php
View File

@ -1820,6 +1820,37 @@ class Member_GroupSet extends ManyManyList {
} }
} }
public function removeAll() {
$base = ClassInfo::baseDataClass($this->dataClass());
// Remove the join to the join table to avoid MySQL row locking issues.
$query = $this->dataQuery();
$foreignFilter = $query->getQueryParam('Foreign.Filter');
$query->removeFilterOn($foreignFilter);
$selectQuery = $query->query();
$selectQuery->setSelect("\"{$base}\".\"ID\"");
$from = $selectQuery->getFrom();
unset($from[$this->joinTable]);
$selectQuery->setFrom($from);
$selectQuery->setOrderBy(); // ORDER BY in subselects breaks MS SQL Server and is not necessary here
$selectQuery->setDistinct(false);
// Use a sub-query as SQLite does not support setting delete targets in
// joined queries.
$delete = new SQLDelete();
$delete->setFrom("\"{$this->joinTable}\"");
// Use ManyManyList::foreignIDFilter() rather than the one in this class
// otherwise we end up selecting the wrong columns
$delete->addWhere(parent::foreignIDFilter());
$subSelect = $selectQuery->sql($parameters);
$delete->addWhere(array(
"\"{$this->joinTable}\".\"{$this->localKey}\" IN ($subSelect)" => $parameters
));
$delete->execute();
}
/** /**
* Determine if the following groups IDs can be added * Determine if the following groups IDs can be added
* *

29
tests/security/MemberTest.php
View File

@ -377,6 +377,35 @@ class MemberTest extends FunctionalTest {
); );
} }
/**
* Assertions to check that Member_GroupSet is functionally equivalent to ManyManyList
*/
public function testRemoveGroups()
{
$staffmember = $this->objFromFixture('Member', 'staffmember');
$staffgroup = $this->objFromFixture('Group', 'staffgroup');
$managementgroup = $this->objFromFixture('Group', 'managementgroup');
$this->assertTrue(
$staffmember->inGroups(array($staffgroup, $managementgroup)),
'inGroups() succeeds if a membership is detected on one of many passed groups'
);
$staffmember->Groups()->remove($managementgroup);
$this->assertFalse(
$staffmember->inGroup($managementgroup),
'member was not removed from group using ->Groups()->remove()'
);
$staffmember->Groups()->removeAll();
$this->assertEquals(
0,
$staffmember->Groups()->count(),
'member was not removed from all groups using ->Groups()->removeAll()'
);
}
public function testAddToGroupByCode() { public function testAddToGroupByCode() {
$grouplessMember = $this->objFromFixture('Member', 'grouplessmember'); $grouplessMember = $this->objFromFixture('Member', 'grouplessmember');
$memberlessGroup = $this->objFromFixture('Group','memberlessgroup'); $memberlessGroup = $this->objFromFixture('Group','memberlessgroup');