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

Modified the page based off the FB about the position of the parameter

Shunm634-source 3 лет назад
Родитель
Сommit
17a3b78dc0
1 измененных файлов с 8 добавлено и 8 удалено
  1. 8 8
      packages/app/src/server/service/page.ts

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

@@ -169,7 +169,7 @@ class PageService {
 
     // Change the parameter of the function into the pages
     // rename
-    this.pageEvent.on('rename', async(page, descendantPages, user) => {
+    this.pageEvent.on('rename', async(page, user, descendantPages) => {
       const isRecursively = descendantPages != null;
       const action = isRecursively ? SUPPORTED_ACTION_TYPE.ACTION_PAGE_RECURSIVELY_RENAME : SUPPORTED_ACTION_TYPE.ACTION_PAGE_RENAME;
       try {
@@ -191,7 +191,7 @@ class PageService {
     });
 
     // delete
-    this.pageEvent.on('delete', async(page, descendantPages, user) => {
+    this.pageEvent.on('delete', async(page, user, descendantPages) => {
       const isRecursively = descendantPages != null;
       const action = isRecursively ? SUPPORTED_ACTION_TYPE.ACTION_PAGE_RECURSIVELY_DELETE : SUPPORTED_ACTION_TYPE.ACTION_PAGE_DELETE;
       try {
@@ -543,7 +543,7 @@ class PageService {
       update.updatedAt = new Date();
     }
     const renamedPage = await Page.findByIdAndUpdate(page._id, { $set: update }, { new: true });
-    this.pageEvent.emit('rename', page, null, user);
+    this.pageEvent.emit('rename', page, user, null);
 
     // create page redirect
     if (options.createRedirectPage) {
@@ -689,7 +689,7 @@ class PageService {
       await PageRedirect.create({ fromPath: page.path, toPath: newPagePath });
     }
 
-    this.pageEvent.emit('rename', page, null, user);
+    this.pageEvent.emit('rename', page, user, null);
 
     return renamedPage;
   }
@@ -844,7 +844,7 @@ class PageService {
           await renameDescendants(
             batch, user, options, pathRegExp, newPagePathPrefix, shouldUseV4Process,
           );
-          pageEvent.emit('rename', targetPage, batch, user);
+          pageEvent.emit('rename', targetPage, user, batch);
           logger.debug(`Renaming pages progressing: (count=${count})`);
         }
         catch (err) {
@@ -1420,7 +1420,7 @@ class PageService {
       this.deleteRecursivelyMainOperation(page, user, pageOp._id);
     }
     else {
-      this.pageEvent.emit('delete', page, null, user);
+      this.pageEvent.emit('delete', page, user, null);
     }
 
     return deletedPage;
@@ -1508,7 +1508,7 @@ class PageService {
       }
     }
 
-    this.pageEvent.emit('delete', page, null, user);
+    this.pageEvent.emit('delete', page, user, null);
     this.pageEvent.emit('create', deletedPage, user);
 
     return deletedPage;
@@ -1608,7 +1608,7 @@ class PageService {
         try {
           count += batch.length;
           await deleteDescendants(batch, user);
-          pageEvent.emit('delete', targetPage, batch, user);
+          pageEvent.emit('delete', targetPage, user, batch);
           logger.debug(`Deleting pages progressing: (count=${count})`);
         }
         catch (err) {