Просмотр исходного кода

Modified the code to fix the bug.

Shunm634-source 3 лет назад
Родитель
Сommit
df848d4651
2 измененных файлов с 7 добавлено и 1 удалено
  1. 1 1
      packages/app/src/server/routes/page.js
  2. 6 0
      packages/app/src/server/service/page.ts

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

@@ -1298,7 +1298,7 @@ module.exports = function(crowi, app) {
         if (!crowi.pageService.canDeleteCompletely(page.path, creator, req.user, isRecursively)) {
         if (!crowi.pageService.canDeleteCompletely(page.path, creator, req.user, isRecursively)) {
           return res.json(ApiResponse.error('You can not delete this page completely', 'user_not_admin'));
           return res.json(ApiResponse.error('You can not delete this page completely', 'user_not_admin'));
         }
         }
-        await crowi.pageService.deleteCompletely(page, req.user, options, isRecursively, activityParameters);
+        await crowi.pageService.deleteCompletely(page, req.user, options, isRecursively, false, activityParameters);
       }
       }
       else {
       else {
         // behave like not found
         // behave like not found

+ 6 - 0
packages/app/src/server/service/page.ts

@@ -1404,6 +1404,8 @@ class PageService {
       endpoint: activityParameters.endpoint,
       endpoint: activityParameters.endpoint,
       action: page.descendantCount > 0 ? SupportedAction.ACTION_PAGE_RECURSIVELY_DELETE : SupportedAction.ACTION_PAGE_DELETE,
       action: page.descendantCount > 0 ? SupportedAction.ACTION_PAGE_RECURSIVELY_DELETE : SupportedAction.ACTION_PAGE_DELETE,
       user,
       user,
+      target: page,
+      targetModel: 'Page',
       snapshot: {
       snapshot: {
         username: user.username,
         username: user.username,
       },
       },
@@ -1753,6 +1755,8 @@ class PageService {
       endpoint: activityParameters.endpoint,
       endpoint: activityParameters.endpoint,
       action: page.descendantCount > 0 ? SupportedAction.ACTION_PAGE_RECURSIVELY_DELETE_COMPLETELY : SupportedAction.ACTION_PAGE_DELETE_COMPLETELY,
       action: page.descendantCount > 0 ? SupportedAction.ACTION_PAGE_RECURSIVELY_DELETE_COMPLETELY : SupportedAction.ACTION_PAGE_DELETE_COMPLETELY,
       user,
       user,
+      target: page,
+      targetModel: 'Page',
       snapshot: {
       snapshot: {
         username: user.username,
         username: user.username,
       },
       },
@@ -1983,6 +1987,8 @@ class PageService {
       endpoint: activityParameters.endpoint,
       endpoint: activityParameters.endpoint,
       action: page.descendantCount > 0 ? SupportedAction.ACTION_PAGE_RECURSIVELY_REVERT : SupportedAction.ACTION_PAGE_REVERT,
       action: page.descendantCount > 0 ? SupportedAction.ACTION_PAGE_RECURSIVELY_REVERT : SupportedAction.ACTION_PAGE_REVERT,
       user,
       user,
+      target: page,
+      targetModel: 'Page',
       snapshot: {
       snapshot: {
         username: user.username,
         username: user.username,
       },
       },