mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX Using current controller for MemberTableField constructor in Group->getCMSFields() instead of passing in a wrong instance (Group)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113273 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
e4d3584805
commit
d6c9e18333
@ -59,7 +59,7 @@ class Group extends DataObject {
|
||||
new Tab('Members', _t('SecurityAdmin.MEMBERS', 'Members'),
|
||||
new TextField("Title", $this->fieldLabel('Title')),
|
||||
$memberList = new MemberTableField(
|
||||
$this,
|
||||
(Controller::has_curr()) ? Controller::curr() : new Controller(),
|
||||
"Members",
|
||||
$this,
|
||||
null,
|
||||
@ -144,7 +144,6 @@ class Group extends DataObject {
|
||||
$rolesField->setDisabledItems($inheritedRoles->column('ID'));
|
||||
}
|
||||
|
||||
$memberList->setController($this);
|
||||
$memberList->setPermissions(array('edit', 'delete', 'export', 'add', 'inlineadd'));
|
||||
$memberList->setParentClass('Group');
|
||||
$memberList->setPopupCaption(_t('SecurityAdmin.VIEWUSER', 'View User'));
|
||||
|
Loading…
Reference in New Issue
Block a user