zamis 5 лет назад
Родитель
Сommit
dca9552b8f
2 измененных файлов с 5 добавлено и 3 удалено
  1. 1 1
      src/server/routes/page.js
  2. 4 2
      src/server/service/attachment.js

+ 1 - 1
src/server/routes/page.js

@@ -1197,7 +1197,7 @@ module.exports = function(crowi, app) {
           await crowi.pageService.completelyDeletePageRecursively(page, req.user, options);
           await crowi.pageService.completelyDeletePageRecursively(page, req.user, options);
         }
         }
         else {
         else {
-          await crowi.pageService.completelyDeletePage(page, req.user, options);
+          await crowi.pageService.completelyDeletePages(page, req.user, options);
         }
         }
       }
       }
       else {
       else {

+ 4 - 2
src/server/service/attachment.js

@@ -46,8 +46,10 @@ class AttachmentService {
   async removeAttachment(attachments) {
   async removeAttachment(attachments) {
     const { fileUploadService } = this.crowi;
     const { fileUploadService } = this.crowi;
 
 
-    await attachments.forEach(attachment => fileUploadService.deleteFile(attachment));
-    await attachments.forEach(attachment => attachment.remove());
+    return attachments.forEach((attachment) => {
+      fileUploadService.deleteFile(attachment);
+      attachment.remove();
+    });
   }
   }
 
 
 }
 }