tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-09-28 04:16:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.5' into 5.0

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

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

@ -54,8 +54,10 @@ class EditableMemberListField extends EditableFormField
} }
$members = Member::map_in_groups($this->GroupID); $members = Member::map_in_groups($this->GroupID);
$field = DropdownField::create($this->Name, $this->EscapedTitle, $members); $field = DropdownField::create($this->Name, $this->EscapedTitle, $members);
$this->doUpdateFormField($field); $this->doUpdateFormField($field);
return $field; return $field;
} }

2
code/UserForm.php
View File

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