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 Using current controller for MemberTableField constructor in Group->getCMSFields() instead of passing in a wrong instance (Group) (from r113273)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114526 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-12-05 08:24:12 +00:00
parent 9ec31acacb
commit 3f8a0ede40
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/Group.php
View File

@ -59,7 +59,7 @@ class Group extends DataObject {
new Tab('Members', _t('SecurityAdmin.MEMBERS', 'Members'), new Tab('Members', _t('SecurityAdmin.MEMBERS', 'Members'),
new TextField("Title", $this->fieldLabel('Title')), new TextField("Title", $this->fieldLabel('Title')),
$memberList = new MemberTableField( $memberList = new MemberTableField(
$this, (Controller::has_curr()) ? Controller::curr() : new Controller(),
"Members", "Members",
$this, $this,
null, null,
@ -144,7 +144,6 @@ class Group extends DataObject {
$rolesField->setDisabledItems($inheritedRoles->column('ID')); $rolesField->setDisabledItems($inheritedRoles->column('ID'));
} }
$memberList->setController($this);
$memberList->setPermissions(array('edit', 'delete', 'export', 'add', 'inlineadd')); $memberList->setPermissions(array('edit', 'delete', 'export', 'add', 'inlineadd'));
$memberList->setParentClass('Group'); $memberList->setParentClass('Group');
$memberList->setPopupCaption(_t('SecurityAdmin.VIEWUSER', 'View User')); $memberList->setPopupCaption(_t('SecurityAdmin.VIEWUSER', 'View User'));