From 122e54eed687538cf45ccf9853ec5e88192dc01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 17 May 2018 21:09:46 +0200 Subject: [PATCH] fix errors in editing custom field group --- CustomFields/CustomFieldText.php | 3 ++- Form/Type/LinkedCustomFieldsType.php | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CustomFields/CustomFieldText.php b/CustomFields/CustomFieldText.php index c3ccd838c..9b3e1a3ba 100644 --- a/CustomFields/CustomFieldText.php +++ b/CustomFields/CustomFieldText.php @@ -31,6 +31,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; +use Symfony\Component\Form\Extension\Core\Type\TextType; /** * @author Julien Fastré @@ -77,7 +78,7 @@ class CustomFieldText extends AbstractCustomField { $options = $customField->getOptions(); - $type = ($options[self::MAX_LENGTH] < 256) ? 'text' + $type = ($options[self::MAX_LENGTH] < 256) ? TextType::class : TextareaType::class; $attrArray = array(); diff --git a/Form/Type/LinkedCustomFieldsType.php b/Form/Type/LinkedCustomFieldsType.php index 3e506872b..d71c503e6 100644 --- a/Form/Type/LinkedCustomFieldsType.php +++ b/Form/Type/LinkedCustomFieldsType.php @@ -25,7 +25,6 @@ use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; use Chill\MainBundle\Templating\TranslatableStringHelper; use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; /** @@ -109,7 +108,7 @@ class LinkedCustomFieldsType extends AbstractType } $options = array_merge($this->options, array( - 'choice_list' => new SimpleChoiceList($choices), + 'choices' => $choices, 'choices_as_values' => true ));