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.5' into 4

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

2
code/model/UserDefinedForm.php
View File

@ -133,7 +133,7 @@ class UserDefinedForm extends Page
// text to show on complete // text to show on complete
$onCompleteFieldSet = new CompositeField( $onCompleteFieldSet = new CompositeField(
$label = new LabelField('OnCompleteMessageLabel', _t('UserDefinedForm.ONCOMPLETELABEL', 'Show on completion')), $label = new LabelField('OnCompleteMessageLabel', _t('UserDefinedForm.ONCOMPLETELABEL', 'Show on completion')),
$editor = new HtmlEditorField('OnCompleteMessage', '', _t('UserDefinedForm.ONCOMPLETEMESSAGE', $self->OnCompleteMessage)) $editor = new HtmlEditorField('OnCompleteMessage', '', $self->OnCompleteMessage)
); );
$onCompleteFieldSet->addExtraClass('field'); $onCompleteFieldSet->addExtraClass('field');

7
code/model/editableformfields/EditableMemberListField.php
View File

@ -45,8 +45,13 @@ class EditableMemberListField extends EditableFormField
} }
$members = Member::map_in_groups($this->GroupID); $members = Member::map_in_groups($this->GroupID);
$field = new DropdownField($this->Name, $this->EscapedTitle, $members);
$field = DropdownField::create($this->Name, $this->EscapedTitle, $members)
->setTemplate('UserFormsDropdownField')
->setFieldHolderTemplate('UserFormsField_holder');
$this->doUpdateFormField($field); $this->doUpdateFormField($field);
return $field; return $field;
} }