Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

BUGFIX Using current controller for MemberTableField constructor in G…

…roup->getCMSFields() instead of passing in a wrong instance (Group) (from r113273)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114526 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
commit 3f8a0ede40482e639f80dc5bc48b715373feea7a 1 parent 9ec31ac
@sminnee sminnee authored
Showing with 1 addition and 2 deletions.
  1. +1 −2  security/Group.php
View
3  security/Group.php
@@ -59,7 +59,7 @@ public function getCMSFields() {
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 @@ public function getCMSFields() {
$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'));
Please sign in to comment.
Something went wrong with that request. Please try again.