feat: properly support translated info collection fields

René Hrdina · René Hrdina · commit a5e904752002 · 2023-03-06T09:37:39.000Z
diff --git a/bundle/Ibexa/ContentForms/InformationCollectionMapper.php b/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
@@ -21,7 +21,7 @@ final class InformationCollectionMapper
      */
     public function mapToFormData(Content $content, Location $location, ContentType $contentType): InformationCollectionStruct
     {
-        $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);
+        $fields = $content->getFieldsByLanguage();
 
         $informationCollectionFields = [];
 
diff --git a/lib/Handler.php b/lib/Handler.php
@@ -39,8 +39,10 @@ public function getForm(Content $content, Location $location): FormInterface
 
         $data = $informationCollectionMapper->mapToFormData($content, $location, $contentType);
 
+        $initialLanguageCode = $content->getVersionInfo()->getInitialLanguage()->languageCode;
+
         return $this->formFactory->create(InformationCollectionType::class, $data, [
-            'languageCode' => $content->contentInfo->mainLanguageCode,
+            'languageCode' => $initialLanguageCode ?? $content->contentInfo->mainLanguageCode,
             'mainLanguageCode' => $content->contentInfo->mainLanguageCode,
         ]);
     }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ final class InformationCollectionMapper`
`21`	`21`	`*/`
`22`	`22`	`public function mapToFormData(Content $content, Location $location, ContentType $contentType): InformationCollectionStruct`
`23`	`23`	`{`
`24`		`- $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);`
	`24`	`+ $fields = $content->getFieldsByLanguage();`
`25`	`25`
`26`	`26`	`$informationCollectionFields = [];`
`27`	`27`