mirror of
https://github.com/silverstripe/silverstripe-userforms.git
synced 2024-10-22 17:05:42 +02:00
Merge branch '4.5' into 4
This commit is contained in:
commit
5904b7408a
code/model
@ -133,7 +133,7 @@ class UserDefinedForm extends Page
|
||||
// text to show on complete
|
||||
$onCompleteFieldSet = new CompositeField(
|
||||
$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');
|
||||
|
@ -45,8 +45,13 @@ class EditableMemberListField extends EditableFormField
|
||||
}
|
||||
|
||||
$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);
|
||||
|
||||
return $field;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user