zamis 5 лет назад
Родитель
Сommit
3ca721f671
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      src/server/models/page.js

+ 7 - 7
src/server/models/page.js

@@ -1128,17 +1128,17 @@ module.exports = function(crowi) {
 
   pageSchema.statics.deletePageRecursively = async function(targetPage, user, options = {}) {
     const isTrashed = checkIfTrashed(targetPage.path);
-
+    const newPath = this.getDeletedPageName(targetPage.path);
     if (isTrashed) {
       throw new Error('This method does NOT supports deleting trashed pages.');
     }
 
-    // find manageable descendants (this array does not include GRANT_RESTRICTED)
-    const pages = await this.findManageableListWithDescendants(targetPage, user, options);
-
-    await Promise.all(pages.map((page) => {
-      return this.deletePage(page, user, options);
-    }));
+    const socketClientId = options.socketClientId || null;
+    if (this.isDeletableName(targetPage.path)) {
+      targetPage.status = STATUS_DELETED;
+    }
+    const hoge = await this.renameRecursively(targetPage, newPath, user, { socketClientId, createRedirectPage: true });
+    return hoge;
   };