pkp#9425 Fixes omp crash

jyhein · Oct 31, 2023 · d837ad6 · d837ad6
1 parent cdbe159
commit d837ad6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/classes/submissionFile/maps/Schema.php b/classes/submissionFile/maps/Schema.php
@@ -226,9 +226,16 @@ protected function mapByProperties(array $props, SubmissionFile $submissionFile)
             $output[$prop] = $submissionFile->getData($prop);
         }
 
-        $publicationId = $submissionFile->getData('assocId') ? Repo::galley()->get($submissionFile->getData('assocId'))?->getData('publicationId') : null;
-        $publicationLocales = $publicationId ? Repo::publication()->get($publicationId)?->getLanguages() ?? [] : [];
-        $locales = array_values(array_unique(array_merge($this->context->getSupportedSubmissionMetadataLocales(), $publicationLocales, [$submissionFile->getData('locale')])));
+        $publicationLocales = !($assocId = $submissionFile->getData('assocId')) 
+        ? [$submissionFile->getData('locale')]
+        : Repo::submission()
+            ->get($submissionFile->getData('submissionId'))
+            ->getData('publications')
+            ->first(fn ($p) => collect($p->getData(Application::get()->getName() === 'omp' ? 'publicationFormats' : 'galleys'))
+                ->contains(fn ($item) => $item->getId() === $submissionFile->getData('assocId')))
+            ->getLanguages();
+
+        $locales = array_values(array_unique(array_merge($this->context->getSupportedSubmissionMetadataLocales(), $publicationLocales)));
 
         $output = $this->schemaService->addMissingMultilingualValues(
             $this->schema,

diff --git a/controllers/wizard/fileUpload/form/SubmissionFilesMetadataForm.php b/controllers/wizard/fileUpload/form/SubmissionFilesMetadataForm.php
@@ -51,7 +51,12 @@ public function __construct($submissionFile, $stageId, $reviewRound = null, $tem
         }
 
         $submissionLocale = $submissionFile->getData('locale');
-        $publicationLocaleNames = Repo::publication()->get(Repo::galley()->get($submissionFile->getData('assocId'))?->getData('publicationId'))?->getLanguageNames() ?? [];
+        $publicationLocaleNames = Repo::submission()
+            ->get($submissionFile->getData('submissionId'))
+            ->getData('publications')
+            ->first(fn ($p) => collect($p->getData(Application::get()->getName() === 'omp' ? 'publicationFormats' : 'galleys'))
+                ->contains(fn ($item) => $item->getId() === $submissionFile->getData('assocId')))
+            ->getLanguageNames();
         $localeNames = Application::get()->getRequest()->getContext()->getSupportedSubmissionMetadataLocaleNames() + $publicationLocaleNames;
         ksort($localeNames);