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

Merge branch '4.0'

Browse Source
This commit is contained in:
Daniel Hensby 2016-09-23 17:27:15 +01:00
commit 54e6e9aeb5
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,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);

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

@ -162,7 +162,8 @@ class EditableOption extends DataObject
return $value; return $value;
} }
protected function onBeforeWrite() { protected function onBeforeWrite()
{
if (!$this->Sort) { if (!$this->Sort) {
$this->Sort = EditableOption::get()->max('Sort') + 1; $this->Sort = EditableOption::get()->max('Sort') + 1;
} }