Merge branch '3.0' into 3.1

This commit is contained in:
Daniel Hensby 2016-09-23 17:21:37 +01:00
commit eed799dbd9
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 7 additions and 1 deletions

View File

@ -82,6 +82,11 @@ class EditableFormField extends DataObject {
"ShowOnLoad" => "Boolean(1)", // from CustomSettings "ShowOnLoad" => "Boolean(1)", // from CustomSettings
); );
private static $defaults = array(
'ShowOnLoad' => true,
);
/** /**
* @config * @config
* @var array * @var array

View File

@ -56,7 +56,8 @@ class EditableFormHeading extends EditableFormField {
} }
public function getFormField() { public function getFormField() {
$labelField = new HeaderField($this->Name, $this->EscapedTitle, $this->Level); $labelField = HeaderField::create($this->EscapedTitle)
->setHeadingLevel($this->Level);
$labelField->addExtraClass('FormHeading'); $labelField->addExtraClass('FormHeading');
$labelField->setAttribute('data-id', $this->Name); $labelField->setAttribute('data-id', $this->Name);
$this->doUpdateFormField($labelField); $this->doUpdateFormField($labelField);