tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.2' into 3.3

Browse Source
This commit is contained in:
Daniel Hensby 2016-07-11 21:10:06 +01:00
commit e1ccb3b379
No known key found for this signature in database
GPG Key ID: 229831A941962E26
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forms/CheckboxSetField.php
View File

@ -54,9 +54,7 @@ class CheckboxSetField extends OptionsetField {
'Options' => $this->getOptions()
));
return $this->customise($properties)->renderWith(
$this->getTemplates()
);
return FormField::Field($properties);
}
/**

2
forms/ListboxField.php
View File

@ -102,7 +102,7 @@ class ListboxField extends DropdownField {
'Options' => new ArrayList($options)
));
return $this->customise($properties)->renderWith($this->getTemplates());
return FormField::Field($properties);
}
public function getAttributes() {

4
forms/OptionsetField.php
View File

@ -83,9 +83,7 @@ class OptionsetField extends DropdownField {
'Options' => new ArrayList($options)
));
return $this->customise($properties)->renderWith(
$this->getTemplates()
);
return FormField::Field($properties);
}
/**

2
forms/TreeDropdownField.php
View File

@ -248,7 +248,7 @@ class TreeDropdownField extends FormField {
)
);
return $this->customise($properties)->renderWith('TreeDropdownField');
return parent::Field($properties);
}
public function extraClass() {

2
forms/TreeMultiselectField.php
View File

@ -135,7 +135,7 @@ class TreeMultiselectField extends TreeDropdownField {
'Value' => $value
)
);
return $this->customise($properties)->renderWith('TreeDropdownField');
return FormField::Field($properties);
}
/**

4
forms/UploadField.php
View File

@ -974,11 +974,11 @@ class UploadField extends FileField {
}
$mergedConfig = array_merge($config, $this->ufConfig);
return $this->customise(array(
return parent::Field(array(
'configString' => str_replace('"', """, Convert::raw2json($mergedConfig)),
'config' => new ArrayData($mergedConfig),
'multiple' => $allowedMaxFileNumber !== 1
))->renderWith($this->getTemplates());
));
}
/**