feat: properly support translated info collection fields

René Hrdina · René Hrdina · commit 710fe575a648 · 2023-03-06T09:36:03.000Z
diff --git a/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php b/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php
@@ -26,7 +26,7 @@ final class InformationCollectionMapper
      */
     public function mapToFormData(Content $content, Location $location, ContentType $contentType)
     {
-        $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);
+        $fields = $content->getFieldsByLanguage();
 
         $informationCollectionFields = [];
 
diff --git a/lib/Handler.php b/lib/Handler.php
@@ -46,8 +46,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
`@@ -26,7 +26,7 @@ final class InformationCollectionMapper`
`26`	`26`	`*/`
`27`	`27`	`public function mapToFormData(Content $content, Location $location, ContentType $contentType)`
`28`	`28`	`{`
`29`		`- $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);`
	`29`	`+ $fields = $content->getFieldsByLanguage();`
`30`	`30`
`31`	`31`	`$informationCollectionFields = [];`
`32`	`32`