EZP-28649: Invalid field type label in content translation (ezsystems…

…#204)
ezpublishlegacy · Dec 21, 2017 · 8f358e5 · 8f358e5
1 parent 6ff90e8
commit 8f358e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/FieldType/Mapper/KeywordFormMapper.php b/lib/FieldType/Mapper/KeywordFormMapper.php
@@ -23,6 +23,8 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
     {
         $fieldDefinition = $data->fieldDefinition;
         $formConfig = $fieldForm->getConfig();
+        $names = $fieldDefinition->getNames();
+        $label = $fieldDefinition->getName($formConfig->getOption('mainLanguageCode')) ?: reset($names);
 
         $fieldForm
             ->add(
@@ -32,7 +34,7 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
                         KeywordFieldType::class,
                         [
                             'required' => $fieldDefinition->isRequired,
-                            'label' => $fieldDefinition->getName($formConfig->getOption('languageCode')),
+                            'label' => $label,
                         ]
                     )
                     ->setAutoInitialize(false)

diff --git a/lib/FieldType/Mapper/RelationListFormMapper.php b/lib/FieldType/Mapper/RelationListFormMapper.php
@@ -59,7 +59,7 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
                         RelationListFieldType::class,
                         [
                             'required' => $fieldDefinition->isRequired,
-                            'label' => $fieldDefinition->getName($label),
+                            'label' => $label,
                         ]
                     )
                     ->setAutoInitialize(false)

diff --git a/lib/FieldType/Mapper/TextLineFormMapper.php b/lib/FieldType/Mapper/TextLineFormMapper.php
@@ -54,6 +54,8 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
         $fieldDefinition = $data->fieldDefinition;
         $formConfig = $fieldForm->getConfig();
         $validatorConfiguration = $fieldDefinition->getValidatorConfiguration();
+        $names = $fieldDefinition->getNames();
+        $label = $fieldDefinition->getName($formConfig->getOption('mainLanguageCode')) ?: reset($names);
 
         $fieldForm
             ->add(
@@ -63,7 +65,7 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
                         TextLineFieldType::class,
                         [
                             'required' => $fieldDefinition->isRequired,
-                            'label' => $fieldDefinition->getName($formConfig->getOption('languageCode')),
+                            'label' => $label,
                             'min' => $validatorConfiguration['StringLengthValidator']['minStringLength'],
                             'max' => $validatorConfiguration['StringLengthValidator']['maxStringLength'],
                         ]