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

when revertDeletedPage is executed, the revert event is raised

Shun Miyazawa 4 лет назад
Родитель
Сommit
2e8d3dc935

+ 6 - 1
packages/app/src/server/service/page.js

@@ -661,7 +661,12 @@ class PageService {
       this.deleteCompletelyDescendantsWithStream(page, user, options);
     }
 
-    this.pageEvent.emit('deleteCompletely', page, user); // update as renamed page
+    if (page.redirectTo != null && isTrashPage(page.redirectTo)) {
+      this.pageEvent.emit('revert', page, user);
+    }
+    else {
+      this.pageEvent.emit('deleteCompletely', page, user);
+    }
 
     return;
   }

+ 1 - 0
packages/app/src/server/service/search.ts

@@ -115,6 +115,7 @@ class SearchService implements SearchQueryParser, SearchResolver {
     pageEvent.on('create', this.fullTextSearchDelegator.syncPageUpdated.bind(this.fullTextSearchDelegator));
     pageEvent.on('update', this.fullTextSearchDelegator.syncPageUpdated.bind(this.fullTextSearchDelegator));
     pageEvent.on('delete', this.fullTextSearchDelegator.syncPageDeleted.bind(this.fullTextSearchDelegator));
+    pageEvent.on('revert', this.fullTextSearchDelegator.syncPageDeleted.bind(this.fullTextSearchDelegator));
     pageEvent.on('deleteCompletely', this.fullTextSearchDelegator.syncPageDeleted.bind(this.fullTextSearchDelegator));
     pageEvent.on('syncDescendantsDelete', this.fullTextSearchDelegator.syncDescendantsPagesDeleted.bind(this.fullTextSearchDelegator));
     pageEvent.on('updateMany', this.fullTextSearchDelegator.syncPagesUpdated.bind(this.fullTextSearchDelegator));