Răsfoiți Sursa

feat: allow fileUplaoadType none in new growi

mizozobu 3 ani în urmă
părinte
comite
daa05cb5a9
1 a modificat fișierele cu 11 adăugiri și 2 ștergeri
  1. 11 2
      packages/app/src/server/service/g2g-transfer.ts

+ 11 - 2
packages/app/src/server/service/g2g-transfer.ts

@@ -236,7 +236,7 @@ export class G2GTransferPusherService implements Pusher {
   }
 
   public async getTransferability(toGROWIInfo: IDataGROWIInfo): Promise<Transferability> {
-    const { fileUploadService } = this.crowi;
+    const { fileUploadService, configManager } = this.crowi;
 
     const version = this.crowi.version;
     if (version !== toGROWIInfo.version) {
@@ -264,7 +264,16 @@ export class G2GTransferPusherService implements Pusher {
       };
     }
 
-    if (!toGROWIInfo.attachmentInfo.writable) {
+    if (configManager.getConfig('crowi', 'app:fileUploadType') === 'none') {
+      return {
+        canTransfer: false,
+        // TODO: i18n for reason
+        reason: 'File upload is not configured for this Growi.',
+      };
+    }
+
+    const shouldUseFileUploadTypeOfNewGrowi = toGROWIInfo.attachmentInfo.type !== 'none';
+    if (shouldUseFileUploadTypeOfNewGrowi && !toGROWIInfo.attachmentInfo.writable) {
       return {
         canTransfer: false,
         // TODO: i18n for reason