Taichi Masuyama 4 лет назад
Родитель
Сommit
1ac990ffb0
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      packages/app/src/server/routes/page.js
  2. 1 1
      packages/app/src/server/service/page.ts

+ 2 - 2
packages/app/src/server/routes/page.js

@@ -1155,9 +1155,9 @@ module.exports = function(crowi, app) {
     const previousRevision = req.body.revision_id || null;
     const previousRevision = req.body.revision_id || null;
 
 
     // get completely flag
     // get completely flag
-    const isCompletely = (req.body.completely != null);
+    const isCompletely = req.body.completely;
     // get recursively flag
     // get recursively flag
-    const isRecursively = (req.body.recursively != null);
+    const isRecursively = req.body.recursively;
 
 
     const options = {};
     const options = {};
 
 

+ 1 - 1
packages/app/src/server/service/page.ts

@@ -884,7 +884,7 @@ class PageService {
     await Revision.updateRevisionListByPageId(page._id, { pageId: page._id });
     await Revision.updateRevisionListByPageId(page._id, { pageId: page._id });
     const deletedPage = await Page.findByIdAndUpdate(page._id, {
     const deletedPage = await Page.findByIdAndUpdate(page._id, {
       $set: {
       $set: {
-        path: newPath, status: Page.STATUS_DELETED, deleteUser: user._id, deletedAt: Date.now(),
+        path: newPath, status: Page.STATUS_DELETED, deleteUser: user._id, deletedAt: Date.now(), parent: null, // set parent as null
       },
       },
     }, { new: true });
     }, { new: true });
     await PageTagRelation.updateMany({ relatedPage: page._id }, { $set: { isPageTrashed: true } });
     await PageTagRelation.updateMany({ relatedPage: page._id }, { $set: { isPageTrashed: true } });