IBX-6636: ezSelection default label 'ALL' is incorrect for NOT multip…

…le choice setting
ibexa · Nov 13, 2024 · cb5702c · cb5702c
1 parent 19ee7c7
commit cb5702c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/bundle/Resources/translations/ibexa_content_forms_fieldtype.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_fieldtype.en.xliff
@@ -131,6 +131,11 @@
         <target state="new">Content location</target>
         <note>key: content_forms.relation.location_type.self</note>
       </trans-unit>
+      <trans-unit id="3753c5a7d2bddee50d6ffe5148884aa1ff5bfcb8" resname="content.field_type.ezselection.none">
+        <source>None</source>
+        <target state="new">None</target>
+        <note>key: content.field_type.ezselection.none</note>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/src/lib/FieldType/Mapper/SelectionFormMapper.php b/src/lib/FieldType/Mapper/SelectionFormMapper.php
@@ -11,10 +11,19 @@
 use Ibexa\ContentForms\Form\Type\FieldType\SelectionFieldType;
 use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
 use Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface;
+use JMS\TranslationBundle\Annotation\Desc;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SelectionFormMapper implements FieldValueFormMapperInterface
 {
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
     {
         $fieldDefinition = $data->fieldDefinition;
@@ -29,6 +38,13 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
             $choices = $fieldDefinition->fieldSettings['multilingualOptions'][$fieldDefinition->mainLanguageCode];
         }
 
+        $placeholder = $this->translator->trans(
+            /** @Desc("None") */
+            'content.field_type.ezselection.none',
+            [],
+            'ibexa_content_forms_fieldtype',
+        );
+
         $fieldForm
             ->add(
                 $formConfig->getFormFactory()->createBuilder()
@@ -40,6 +56,7 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
                                    'label' => $fieldDefinition->getName(),
                                    'multiple' => $fieldDefinition->fieldSettings['isMultiple'],
                                    'choices' => array_flip($choices),
+                                   'placeholder' => $placeholder,
                                ]
                            )
                            ->setAutoInitialize(false)