tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.0' into 3.1

This commit is contained in:
Daniel Hensby 2016-09-23 17:21:37 +01:00
parent ca2a6a3e99 dec9356923
commit eed799dbd9
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/model/editableformfields/EditableFormField.php
View File

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

3
code/model/editableformfields/EditableFormHeading.php
View File

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