From 7da3497668f18cf7dac2567a68f8999f754d8b01 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 3 Oct 2008 22:47:06 +0000 Subject: [PATCH] ENHANCEMENT Using DataObject->Title for has_one dropdowns generated in DataObject->scaffoldFormFields() MINOR Removed scaffolded header field in DataObject->scaffoldFormFields() git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63632 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/DataObject.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/model/DataObject.php b/core/model/DataObject.php index 22d1c3852..2be112003 100644 --- a/core/model/DataObject.php +++ b/core/model/DataObject.php @@ -1498,7 +1498,6 @@ class DataObject extends ViewableData implements DataObjectInterface { */ public function scaffoldFormFields($fieldClasses = null) { $fields = new FieldSet(); - $fields->push(new HeaderField($this->singular_name())); foreach($this->db() as $fieldName => $fieldType) { // @todo Pass localized title if(isset($fieldClasses[$fieldName])) { @@ -1513,9 +1512,9 @@ class DataObject extends ViewableData implements DataObjectInterface { foreach($this->has_one() as $relationship => $component) { $model = singleton($component); $records = DataObject::get($component); - $collect = ($model->hasMethod('customSelectOption')) ? 'customSelectOption' : current($model->summaryFields()); + $collect = ($model->hasMethod('customSelectOption')) ? 'customSelectOption' : 'Title'; $options = $records ? $records->filter_map('ID', $collect) : array(); - $fields->push(new DropdownField($relationship.'ID', $relationship, $options)); + $fields->push(new DropdownField($relationship.'ID', $this->fieldLabel($relationship), $options)); } return $fields; }