itizawa 5 ani în urmă
părinte
comite
127a0c6afc
3 a modificat fișierele cu 5 adăugiri și 6 ștergeri
  1. 3 4
      src/server/models/page.js
  2. 1 1
      src/server/routes/apiv3/pages.js
  3. 1 1
      src/server/routes/page.js

+ 3 - 4
src/server/models/page.js

@@ -1185,18 +1185,17 @@ module.exports = function(crowi) {
   /**
   /**
    * Delete Bookmarks, Attachments, Revisions, Pages and emit delete
    * Delete Bookmarks, Attachments, Revisions, Pages and emit delete
    */
    */
-  pageSchema.statics.completelyDeletePageRecursively = async function(pageData, user, options = {}) {
-    const path = pageData.path;
+  pageSchema.statics.completelyDeletePageRecursively = async function(pagePath, user, options = {}) {
 
 
     const findOpts = { includeRedirect: true, includeTrashed: true };
     const findOpts = { includeRedirect: true, includeTrashed: true };
-    const result = await this.findListWithDescendants(path, user, findOpts);
+    const result = await this.findListWithDescendants(pagePath, user, findOpts);
     const pages = result.pages;
     const pages = result.pages;
 
 
     await Promise.all(pages.map((page) => {
     await Promise.all(pages.map((page) => {
       return this.completelyDeletePage(page, user, options);
       return this.completelyDeletePage(page, user, options);
     }));
     }));
 
 
-    return pageData;
+    return pagePath;
   };
   };
 
 
   pageSchema.statics.removeByPath = function(path) {
   pageSchema.statics.removeByPath = function(path) {

+ 1 - 1
src/server/routes/apiv3/pages.js

@@ -72,7 +72,7 @@ module.exports = (crowi) => {
   */
   */
   router.delete('/empty-trash', loginRequired, adminRequired, csrf, async(req, res) => {
   router.delete('/empty-trash', loginRequired, adminRequired, csrf, async(req, res) => {
     try {
     try {
-      const pages = await Page.completelyDeletePageRecursively({ path: '/trash' }, req.user);
+      const pages = await Page.completelyDeletePageRecursively('/trash', req.user);
       return res.apiv3({ pages });
       return res.apiv3({ pages });
     }
     }
     catch (err) {
     catch (err) {

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

@@ -1245,7 +1245,7 @@ module.exports = function(crowi, app) {
           return res.json(ApiResponse.error('You can not delete completely', 'user_not_admin'));
           return res.json(ApiResponse.error('You can not delete completely', 'user_not_admin'));
         }
         }
         if (isRecursively) {
         if (isRecursively) {
-          page = await Page.completelyDeletePageRecursively(page, req.user, options);
+          await Page.completelyDeletePageRecursively(page.path, req.user, options);
         }
         }
         else {
         else {
           page = await Page.completelyDeletePage(page, req.user, options);
           page = await Page.completelyDeletePage(page, req.user, options);