瀏覽代碼

revert to original

nHigashiWeseek 1 年之前
父節點
當前提交
5cf7dfa982
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 1 1
      apps/app/src/server/routes/apiv3/pages/index.js
  2. 1 2
      apps/app/src/server/service/page/index.ts

+ 1 - 1
apps/app/src/server/routes/apiv3/pages/index.js

@@ -236,7 +236,7 @@ module.exports = (crowi) => {
       offset,
       offset,
       limit,
       limit,
       includeWipPage,
       includeWipPage,
-      includeTrashed: true,
+      includeTrashed: false,
       isRegExpEscapedFromPath: true,
       isRegExpEscapedFromPath: true,
       sort: 'updatedAt',
       sort: 'updatedAt',
       desc: -1,
       desc: -1,

+ 1 - 2
apps/app/src/server/service/page/index.ts

@@ -1678,7 +1678,7 @@ class PageService implements IPageService {
 
 
     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(), updatedAt: Date.now(), parent: null, descendantCount: 0, // set parent as null
+        path: newPath, status: Page.STATUS_DELETED, deleteUser: user._id, deletedAt: Date.now(), parent: null, descendantCount: 0, // set parent as null
       },
       },
     }, { new: true });
     }, { new: true });
 
 
@@ -2238,7 +2238,6 @@ class PageService implements IPageService {
         lastUpdateUser: user._id,
         lastUpdateUser: user._id,
         deleteUser: null,
         deleteUser: null,
         deletedAt: null,
         deletedAt: null,
-        updatedAt: Date.now(),
         parent: parent._id,
         parent: parent._id,
         descendantCount: shouldReplace ? originPage.descendantCount : 0,
         descendantCount: shouldReplace ? originPage.descendantCount : 0,
       },
       },