mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX Fixed wrong call to scaffoldCMSFields() in Member->getCMSFields(), removed addScaffoldRelationFields() call as this is done by the newly called parent::getCMSFields() already
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64173 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
a24ccecb69
commit
dcd77d065c
@ -910,7 +910,7 @@ class Member extends DataObject {
|
||||
* editing this member.
|
||||
*/
|
||||
public function getCMSFields() {
|
||||
$fields = parent::scaffoldCMSFields();
|
||||
$fields = parent::getCMSFields();
|
||||
|
||||
$mainFields = $fields->fieldByName("Root")->fieldByName("Main")->Children;
|
||||
|
||||
@ -951,11 +951,7 @@ class Member extends DataObject {
|
||||
$mainFields->removeByName('Salt');
|
||||
$mainFields->removeByName('NumVisit');
|
||||
$mainFields->removeByName('LastVisited');
|
||||
|
||||
if($this->ID) {
|
||||
$fields = $this->addScaffoldRelationFields($fields);
|
||||
}
|
||||
|
||||
|
||||
$fields->removeByName('Subscriptions');
|
||||
$fields->removeByName('UnsubscribedRecords');
|
||||
// Groups relation will get us into logical conflicts because
|
||||
|
Loading…
x
Reference in New Issue
Block a user