Shun Miyazawa 4 лет назад
Родитель
Сommit
25fb119a73
2 измененных файлов с 4 добавлено и 8 удалено
  1. 0 1
      packages/app/src/server/models/page.js
  2. 4 7
      packages/app/src/server/service/page.js

+ 0 - 1
packages/app/src/server/models/page.js

@@ -1022,7 +1022,6 @@ module.exports = function(crowi) {
     }
 
     pageEvent.emit('update', savedPage, user);
-    pageEvent.emit('update:notification', savedPage, user);
 
     return savedPage;
   };

+ 4 - 7
packages/app/src/server/service/page.js

@@ -32,7 +32,7 @@ class PageService {
     this.pageEvent.on('create', this.pageEvent.onCreate);
 
     // update
-    this.pageEvent.on('update:notification', async(page, user) => {
+    this.pageEvent.on('update', async(page, user) => {
 
       this.pageEvent.onUpdate();
 
@@ -45,7 +45,7 @@ class PageService {
     });
 
     // rename
-    this.pageEvent.on('rename:notification', async(page, user) => {
+    this.pageEvent.on('rename', async(page, user) => {
       try {
         await this.createAndSendNotifications(page, user, ActivityDefine.ACTION_PAGE_RENAME);
       }
@@ -55,7 +55,7 @@ class PageService {
     });
 
     // delete
-    this.pageEvent.on('delete:notification', async(page, user) => {
+    this.pageEvent.on('delete', async(page, user) => {
       try {
         await this.createAndSendNotifications(page, user, ActivityDefine.ACTION_PAGE_DELETE);
       }
@@ -146,9 +146,7 @@ class PageService {
       await Page.create(path, body, user, { redirectTo: newPagePath });
     }
 
-    this.pageEvent.emit('delete', page, user);
-    this.pageEvent.emit('create', renamedPage, user);
-    this.pageEvent.emit('rename:notification', page, user);
+    this.pageEvent.emit('rename', page, user);
 
     return renamedPage;
   }
@@ -477,7 +475,6 @@ class PageService {
 
     this.pageEvent.emit('delete', page, user);
     this.pageEvent.emit('create', deletedPage, user);
-    this.pageEvent.emit('delete:notification', page, user);
 
     return deletedPage;
   }