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 '5.0' into 5.1

Browse Source
This commit is contained in:
Daniel Hensby 2018-05-09 14:03:34 +01:00
commit 8809d516c4
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/Model/EditableFormField/EditableMemberListField.php
View File

@ -54,6 +54,7 @@ class EditableMemberListField extends EditableFormField
}
$members = Member::map_in_groups($this->GroupID);
$field = DropdownField::create($this->Name, $this->Title ?: false, $members)
->setTemplate(EditableDropdown::class)
->setFieldHolderTemplate(EditableFormField::class . '_holder');

2
code/UserForm.php
View File

@ -196,7 +196,7 @@ trait UserForm
$editor = HTMLEditorField::create(
'OnCompleteMessage',
'',
_t(__CLASS__.'.ONCOMPLETEMESSAGE', $this->OnCompleteMessage)
$this->OnCompleteMessage
)
);