Merge remote-tracking branch 'origin/master' into 'upgrade-meteor'

This commit is contained in:
Martin Filser 2022-05-01 10:49:16 +02:00
commit b9d6fe8146
15 changed files with 136 additions and 24 deletions

View file

@ -31,7 +31,7 @@ export default class FileStoreStrategyFactory {
if (!storage) {
storage = fileObj.versions[versionName].storage;
if (!storage) {
if (fileObj.meta.source == "import") {
if (fileObj.meta.source == "import" || fileObj.versions[versionName].meta.gridFsFileId) {
// uploaded by import, so it's in GridFS (MongoDB)
storage = STORAGE_NAME_GRIDFS;
} else {