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

BUGFIX Less fragile 'newness' check on Group->Code in Group->onBeforeWrite() (fixes #6595)

Browse Source
This commit is contained in:
Ingo Schommer 2011-04-14 21:38:07 +12:00
parent d02c3cbdba
commit d5efacbf56
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/Group.php
View File

@ -331,8 +331,11 @@ class Group extends DataObject {
function onBeforeWrite() { function onBeforeWrite() {
parent::onBeforeWrite(); parent::onBeforeWrite();
if(stripos($this->Code, _t('SecurityAdmin.NEWGROUPPREFIX','new-')) === 0) { // Only set code property when the group has a custom title, and no code exists.
$this->setCode($this->Title); // The "Code" attribute is usually treated as a more permanent identifier than database IDs
// in custom application logic, so can't be changed after its first set.
if(!$this->Code && $this->Title != _t('SecurityAdmin.NEWGROUP',"New Group")) {
if(!$this->Code) $this->setCode($this->Title);
} }
} }

19
tests/security/GroupTest.php
View File

@ -4,8 +4,27 @@
* @subpackage tests * @subpackage tests
*/ */
class GroupTest extends FunctionalTest { class GroupTest extends FunctionalTest {
static $fixture_file = 'GroupTest.yml'; static $fixture_file = 'GroupTest.yml';
function testGroupCodeDefaultsToTitle() {
$g1 = new Group();
$g1->Title = "My Title";
$g1->write();
$this->assertEquals('my-title', $g1->Code, 'Custom title gets converted to code if none exists already');
$g2 = new Group();
$g2->Title = "My Title";
$g2->Code = "my-code";
$g2->write();
$this->assertEquals('my-code', $g2->Code, 'Custom attributes are not overwritten by Title field');
$g3 = new Group();
$g3->Title = _t('SecurityAdmin.NEWGROUP',"New Group");
$g3->write();
$this->assertNull($g3->Code, 'Default title doesnt trigger attribute setting');
}
/** /**
* Test the Group::map() function * Test the Group::map() function
*/ */