Skip to content

Commit

Permalink
ENHANCEMENT Use of Object::create('GridField') for Roles grid in
Browse files Browse the repository at this point in the history
SecurityAdmin, to be consistent with Members and Groups grid
instantiation.
MINOR Removing comments referring to CTF
  • Loading branch information
Sean Harvey committed Mar 26, 2012
1 parent 28574e4 commit fd7f2eb
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions admin/code/SecurityAdmin.php
Expand Up @@ -44,18 +44,18 @@ public function getEditForm($id = null, $fields = null) {
if($record && !$record->canView()) return Security::permissionFailure($this);

$memberList = Object::create('GridField',
'Members',
false,
DataList::create('Member'),
'Members',
false,
DataList::create('Member'),
$memberListConfig = GridFieldConfig_RecordEditor::create()
->addComponent(new GridFieldExportButton())
)->addExtraClass("members_grid");
$memberListConfig->getComponentByType('GridFieldDetailForm')->setValidator(new Member_Validator());

$groupList = Object::create('GridField',
'Groups',
false,
DataList::create('Group'),
'Groups',
false,
DataList::create('Group'),
GridFieldConfig_RecordEditor::create()
)->setDisplayFields(array(
'Breadcrumbs' => singleton('Group')->fieldLabel('Title')
Expand All @@ -67,7 +67,7 @@ public function getEditForm($id = null, $fields = null) {
'Root',
new Tab('Users', _t('SecurityAdmin.Users', 'Users'),
$memberList,
new LiteralField('MembersCautionText',
new LiteralField('MembersCautionText',
sprintf('<p class="caution-remove"><strong>%s</strong></p>',
_t(
'SecurityAdmin.MemberListCaution',
Expand Down Expand Up @@ -104,19 +104,14 @@ public function getEditForm($id = null, $fields = null) {

// Add roles editing interface
if(Permission::check('APPLY_ROLES')) {
$rolesField = new GridField(
$rolesField = Object::create('GridField',
'Roles',
false,
DataList::create('PermissionRole'),
GridFieldConfig_RecordEditor::create()
);
// $rolesCTF->setPermissions(array('add', 'edit', 'delete'));

$rolesTab = $fields->findOrMakeTab('Root.Roles', _t('SecurityAdmin.TABROLES', 'Roles'));
$rolesTab->push(new LiteralField(
'RolesDescription',
''
));
$rolesTab->push($rolesField);
}

Expand All @@ -134,7 +129,7 @@ public function getEditForm($id = null, $fields = null) {
$form->addExtraClass('center ss-tabset ' . $this->BaseCSSClasses());

$this->extend('updateEditForm', $form);

return $form;
}

Expand Down

0 comments on commit fd7f2eb

Please sign in to comment.