From f7ffb706ce784fbdcf388ce888b0df9ff934b5b9 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 23 Mar 2018 14:11:39 +1300 Subject: [PATCH 1/2] FIX Use userforms template for member list field, fixes display rule issue --- code/model/editableformfields/EditableMemberListField.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/model/editableformfields/EditableMemberListField.php b/code/model/editableformfields/EditableMemberListField.php index 310e543..7d4ce2f 100644 --- a/code/model/editableformfields/EditableMemberListField.php +++ b/code/model/editableformfields/EditableMemberListField.php @@ -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; } From 8f363d6b608b08a70c423a56473d673cbda923ff Mon Sep 17 00:00:00 2001 From: Raissa North Date: Wed, 9 May 2018 17:43:08 +1200 Subject: [PATCH 2/2] FIX Remove unnecessary translation of parameterised field value --- code/model/UserDefinedForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php index 6b8c70f..78279f9 100755 --- a/code/model/UserDefinedForm.php +++ b/code/model/UserDefinedForm.php @@ -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');