mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merge pull request #2850 from kinglozzer/2827-member-extend
FIX: Rewrite Member getCMSFields to ensure updateCMSFields is only run once (fixes #2827)
This commit is contained in:
Damian Mooyman
commit
1cc366fe23
@ -1202,125 +1202,124 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
* editing this member.
|
* editing this member.
|
||||||
*/
|
*/
|
||||||
public function getCMSFields() {
|
public function getCMSFields() {
|
||||||
require_once('Zend/Date.php');
|
require_once 'Zend/Date.php';
|
||||||
|
|
||||||
$fields = parent::getCMSFields();
|
$self = $this;
|
||||||
|
$this->beforeUpdateCMSFields(function($fields) use ($self) {
|
||||||
|
$mainFields = $fields->fieldByName("Root")->fieldByName("Main")->Children;
|
||||||
|
|
||||||
$mainFields = $fields->fieldByName("Root")->fieldByName("Main")->Children;
|
$password = new ConfirmedPasswordField(
|
||||||
|
'Password',
|
||||||
$password = new ConfirmedPasswordField(
|
null,
|
||||||
'Password',
|
null,
|
||||||
null,
|
null,
|
||||||
null,
|
true // showOnClick
|
||||||
null,
|
|
||||||
true // showOnClick
|
|
||||||
);
|
|
||||||
$password->setCanBeEmpty(true);
|
|
||||||
if(!$this->ID) $password->showOnClick = false;
|
|
||||||
$mainFields->replaceField('Password', $password);
|
|
||||||
|
|
||||||
$mainFields->replaceField('Locale', new DropdownField(
|
|
||||||
"Locale",
|
|
||||||
_t('Member.INTERFACELANG', "Interface Language", 'Language of the CMS'),
|
|
||||||
i18n::get_existing_translations()
|
|
||||||
));
|
|
||||||
|
|
||||||
$mainFields->removeByName('RememberLoginToken');
|
|
||||||
$mainFields->removeByName('AutoLoginHash');
|
|
||||||
$mainFields->removeByName('AutoLoginExpired');
|
|
||||||
$mainFields->removeByName('PasswordEncryption');
|
|
||||||
$mainFields->removeByName('PasswordExpiry');
|
|
||||||
$mainFields->removeByName('LockedOutUntil');
|
|
||||||
|
|
||||||
if(!self::config()->lock_out_after_incorrect_logins) {
|
|
||||||
$mainFields->removeByName('FailedLoginCount');
|
|
||||||
}
|
|
||||||
|
|
||||||
$mainFields->removeByName('Salt');
|
|
||||||
$mainFields->removeByName('NumVisit');
|
|
||||||
|
|
||||||
$mainFields->makeFieldReadonly('LastVisited');
|
|
||||||
|
|
||||||
$fields->removeByName('Subscriptions');
|
|
||||||
|
|
||||||
// Groups relation will get us into logical conflicts because
|
|
||||||
// Members are displayed within group edit form in SecurityAdmin
|
|
||||||
$fields->removeByName('Groups');
|
|
||||||
|
|
||||||
if(Permission::check('EDIT_PERMISSIONS')) {
|
|
||||||
$groupsMap = array();
|
|
||||||
foreach(Group::get() as $group) {
|
|
||||||
// Listboxfield values are escaped, use ASCII char instead of »
|
|
||||||
$groupsMap[$group->ID] = $group->getBreadcrumbs(' > ');
|
|
||||||
}
|
|
||||||
asort($groupsMap);
|
|
||||||
$fields->addFieldToTab('Root.Main',
|
|
||||||
ListboxField::create('DirectGroups', singleton('Group')->i18n_plural_name())
|
|
||||||
->setMultiple(true)
|
|
||||||
->setSource($groupsMap)
|
|
||||||
->setAttribute(
|
|
||||||
'data-placeholder',
|
|
||||||
_t('Member.ADDGROUP', 'Add group', 'Placeholder text for a dropdown')
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
|
$password->setCanBeEmpty(true);
|
||||||
|
if( ! $self->ID) $password->showOnClick = false;
|
||||||
|
$mainFields->replaceField('Password', $password);
|
||||||
|
|
||||||
// Add permission field (readonly to avoid complicated group assignment logic).
|
$mainFields->replaceField('Locale', new DropdownField(
|
||||||
// This should only be available for existing records, as new records start
|
"Locale",
|
||||||
// with no permissions until they have a group assignment anyway.
|
_t('Member.INTERFACELANG', "Interface Language", 'Language of the CMS'),
|
||||||
if($this->ID) {
|
i18n::get_existing_translations()
|
||||||
$permissionsField = new PermissionCheckboxSetField_Readonly(
|
));
|
||||||
'Permissions',
|
|
||||||
false,
|
$mainFields->removeByName('RememberLoginToken');
|
||||||
'Permission',
|
$mainFields->removeByName('AutoLoginHash');
|
||||||
'GroupID',
|
$mainFields->removeByName('AutoLoginExpired');
|
||||||
// we don't want parent relationships, they're automatically resolved in the field
|
$mainFields->removeByName('PasswordEncryption');
|
||||||
$this->getManyManyComponents('Groups')
|
$mainFields->removeByName('PasswordExpiry');
|
||||||
);
|
$mainFields->removeByName('LockedOutUntil');
|
||||||
$fields->findOrMakeTab('Root.Permissions', singleton('Permission')->i18n_plural_name());
|
|
||||||
$fields->addFieldToTab('Root.Permissions', $permissionsField);
|
if( ! $self->config()->lock_out_after_incorrect_logins) {
|
||||||
|
$mainFields->removeByName('FailedLoginCount');
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$permissionsTab = $fields->fieldByName("Root")->fieldByName('Permissions');
|
$mainFields->removeByName('Salt');
|
||||||
if($permissionsTab) $permissionsTab->addExtraClass('readonly');
|
$mainFields->removeByName('NumVisit');
|
||||||
|
|
||||||
$defaultDateFormat = Zend_Locale_Format::getDateFormat(new Zend_Locale($this->Locale));
|
$mainFields->makeFieldReadonly('LastVisited');
|
||||||
$dateFormatMap = array(
|
|
||||||
'MMM d, yyyy' => Zend_Date::now()->toString('MMM d, yyyy'),
|
|
||||||
'yyyy/MM/dd' => Zend_Date::now()->toString('yyyy/MM/dd'),
|
|
||||||
'MM/dd/yyyy' => Zend_Date::now()->toString('MM/dd/yyyy'),
|
|
||||||
'dd/MM/yyyy' => Zend_Date::now()->toString('dd/MM/yyyy'),
|
|
||||||
);
|
|
||||||
$dateFormatMap[$defaultDateFormat] = Zend_Date::now()->toString($defaultDateFormat)
|
|
||||||
. sprintf(' (%s)', _t('Member.DefaultDateTime', 'default'));
|
|
||||||
$mainFields->push(
|
|
||||||
$dateFormatField = new MemberDatetimeOptionsetField(
|
|
||||||
'DateFormat',
|
|
||||||
$this->fieldLabel('DateFormat'),
|
|
||||||
$dateFormatMap
|
|
||||||
)
|
|
||||||
);
|
|
||||||
$dateFormatField->setValue($this->DateFormat);
|
|
||||||
|
|
||||||
$defaultTimeFormat = Zend_Locale_Format::getTimeFormat(new Zend_Locale($this->Locale));
|
$fields->removeByName('Subscriptions');
|
||||||
$timeFormatMap = array(
|
|
||||||
'h:mm a' => Zend_Date::now()->toString('h:mm a'),
|
|
||||||
'H:mm' => Zend_Date::now()->toString('H:mm'),
|
|
||||||
);
|
|
||||||
$timeFormatMap[$defaultTimeFormat] = Zend_Date::now()->toString($defaultTimeFormat)
|
|
||||||
. sprintf(' (%s)', _t('Member.DefaultDateTime', 'default'));
|
|
||||||
$mainFields->push(
|
|
||||||
$timeFormatField = new MemberDatetimeOptionsetField(
|
|
||||||
'TimeFormat',
|
|
||||||
$this->fieldLabel('TimeFormat'),
|
|
||||||
$timeFormatMap
|
|
||||||
)
|
|
||||||
);
|
|
||||||
$timeFormatField->setValue($this->TimeFormat);
|
|
||||||
|
|
||||||
$this->extend('updateCMSFields', $fields);
|
// Groups relation will get us into logical conflicts because
|
||||||
|
// Members are displayed within group edit form in SecurityAdmin
|
||||||
|
$fields->removeByName('Groups');
|
||||||
|
|
||||||
return $fields;
|
if(Permission::check('EDIT_PERMISSIONS')) {
|
||||||
|
$groupsMap = array();
|
||||||
|
foreach(Group::get() as $group) {
|
||||||
|
// Listboxfield values are escaped, use ASCII char instead of »
|
||||||
|
$groupsMap[$group->ID] = $group->getBreadcrumbs(' > ');
|
||||||
|
}
|
||||||
|
asort($groupsMap);
|
||||||
|
$fields->addFieldToTab('Root.Main',
|
||||||
|
ListboxField::create('DirectGroups', singleton('Group')->i18n_plural_name())
|
||||||
|
->setMultiple(true)
|
||||||
|
->setSource($groupsMap)
|
||||||
|
->setAttribute(
|
||||||
|
'data-placeholder',
|
||||||
|
_t('Member.ADDGROUP', 'Add group', 'Placeholder text for a dropdown')
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Add permission field (readonly to avoid complicated group assignment logic).
|
||||||
|
// This should only be available for existing records, as new records start
|
||||||
|
// with no permissions until they have a group assignment anyway.
|
||||||
|
if($self->ID) {
|
||||||
|
$permissionsField = new PermissionCheckboxSetField_Readonly(
|
||||||
|
'Permissions',
|
||||||
|
false,
|
||||||
|
'Permission',
|
||||||
|
'GroupID',
|
||||||
|
// we don't want parent relationships, they're automatically resolved in the field
|
||||||
|
$self->getManyManyComponents('Groups')
|
||||||
|
);
|
||||||
|
$fields->findOrMakeTab('Root.Permissions', singleton('Permission')->i18n_plural_name());
|
||||||
|
$fields->addFieldToTab('Root.Permissions', $permissionsField);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$permissionsTab = $fields->fieldByName("Root")->fieldByName('Permissions');
|
||||||
|
if($permissionsTab) $permissionsTab->addExtraClass('readonly');
|
||||||
|
|
||||||
|
$defaultDateFormat = Zend_Locale_Format::getDateFormat(new Zend_Locale($self->Locale));
|
||||||
|
$dateFormatMap = array(
|
||||||
|
'MMM d, yyyy' => Zend_Date::now()->toString('MMM d, yyyy'),
|
||||||
|
'yyyy/MM/dd' => Zend_Date::now()->toString('yyyy/MM/dd'),
|
||||||
|
'MM/dd/yyyy' => Zend_Date::now()->toString('MM/dd/yyyy'),
|
||||||
|
'dd/MM/yyyy' => Zend_Date::now()->toString('dd/MM/yyyy'),
|
||||||
|
);
|
||||||
|
$dateFormatMap[$defaultDateFormat] = Zend_Date::now()->toString($defaultDateFormat)
|
||||||
|
. sprintf(' (%s)', _t('Member.DefaultDateTime', 'default'));
|
||||||
|
$mainFields->push(
|
||||||
|
$dateFormatField = new MemberDatetimeOptionsetField(
|
||||||
|
'DateFormat',
|
||||||
|
$self->fieldLabel('DateFormat'),
|
||||||
|
$dateFormatMap
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$dateFormatField->setValue($self->DateFormat);
|
||||||
|
|
||||||
|
$defaultTimeFormat = Zend_Locale_Format::getTimeFormat(new Zend_Locale($self->Locale));
|
||||||
|
$timeFormatMap = array(
|
||||||
|
'h:mm a' => Zend_Date::now()->toString('h:mm a'),
|
||||||
|
'H:mm' => Zend_Date::now()->toString('H:mm'),
|
||||||
|
);
|
||||||
|
$timeFormatMap[$defaultTimeFormat] = Zend_Date::now()->toString($defaultTimeFormat)
|
||||||
|
. sprintf(' (%s)', _t('Member.DefaultDateTime', 'default'));
|
||||||
|
$mainFields->push(
|
||||||
|
$timeFormatField = new MemberDatetimeOptionsetField(
|
||||||
|
'TimeFormat',
|
||||||
|
$self->fieldLabel('TimeFormat'),
|
||||||
|
$timeFormatMap
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$timeFormatField->setValue($self->TimeFormat);
|
||||||
|
});
|
||||||
|
|
||||||
|
return parent::getCMSFields();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -614,6 +614,22 @@ class MemberTest extends FunctionalTest {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test that extensions using updateCMSFields() are applied correctly
|
||||||
|
*/
|
||||||
|
public function testUpdateCMSFields() {
|
||||||
|
Member::add_extension('MemberTest_FieldsExtension');
|
||||||
|
|
||||||
|
$member = singleton('Member');
|
||||||
|
$fields = $member->getCMSFields();
|
||||||
|
|
||||||
|
$this->assertNotNull($fields->dataFieldByName('Email'), 'Scaffolded fields are retained');
|
||||||
|
$this->assertNull($fields->dataFieldByName('Salt'), 'Field modifications run correctly');
|
||||||
|
$this->assertNotNull($fields->dataFieldByName('TestMemberField'), 'Extension is applied correctly');
|
||||||
|
|
||||||
|
Member::remove_extension('MemberTest_FieldsExtension');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test that all members are returned
|
* Test that all members are returned
|
||||||
*/
|
*/
|
||||||
@ -827,6 +843,18 @@ class MemberTest_ViewingDeniedExtension extends DataExtension implements TestOnl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
class MemberTest_FieldsExtension extends DataExtension implements TestOnly {
|
||||||
|
|
||||||
|
public function updateCMSFields(FieldList $fields) {
|
||||||
|
$fields->addFieldToTab('Root.Main', new TextField('TestMemberField', 'Test'));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage tests
|
* @subpackage tests
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user