tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-01 00:49:33 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fixed bug in getCMSFields scaffolding of relations

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63739 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-10-07 04:03:24 +00:00
parent ce42fd3f26
commit 09cbef9146
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/model/DataObject.php
View File

@ -1202,7 +1202,7 @@ class DataObject extends ViewableData implements DataObjectInterface {
*/
protected function addScaffoldRelationFields($fieldSet) {
// make sure we have a tabset
if($this->has_many() || $this->many_many()) {
if(($this->has_many() || $this->many_many()) && !$fieldSet->fieldByName('Root')) {
$oldFields = $fieldSet;
$fieldSet = new FieldSet(new TabSet("Root", new Tab("Main")));
foreach($oldFields as $field) {
@ -1587,7 +1587,7 @@ class DataObject extends ViewableData implements DataObjectInterface {
// If we don't have an ID, then relation fields don't work
if($this->ID) {
$this->addScaffoldRelationFields($tabbedFields);
$tabbedFields = $this->addScaffoldRelationFields($tabbedFields);
}
$this->extend('updateCMSFields', $tabbedFields);