Parcourir la source

fix renameDescendantsWithStream

Yuki Takei il y a 4 ans
Parent
commit
35fef914d0
2 fichiers modifiés avec 10 ajouts et 2 suppressions
  1. 5 0
      src/server/models/page.js
  2. 5 2
      src/server/service/page.js

+ 5 - 0
src/server/models/page.js

@@ -826,6 +826,11 @@ module.exports = function(crowi) {
    */
   pageSchema.statics.addConditionToFilteringByViewerForList = addConditionToFilteringByViewerForList;
 
+  /**
+   * export addConditionToFilteringByViewerToEdit as static method
+   */
+  pageSchema.statics.addConditionToFilteringByViewerToEdit = addConditionToFilteringByViewerToEdit;
+
   /**
    * Throw error for growi-lsx-plugin (v1.x)
    */

+ 5 - 2
src/server/service/page.js

@@ -147,10 +147,13 @@ class PageService {
     const { PageQueryBuilder } = Page;
     const pathRegExp = new RegExp(`^${escapeStringRegexp(targetPage.path)}`, 'i');
 
-    const readStream = new PageQueryBuilder(Page.find())
+    const builder = new PageQueryBuilder(Page.find())
       .addConditionToExcludeRedirect()
       .addConditionToListOnlyDescendants(targetPage.path)
-      .addConditionToFilteringByViewer(user)
+
+    await Page.addConditionToFilteringByViewerToEdit(builder, user)
+
+    const readStream = builder
       .query
       .lean()
       .cursor({ batchSize: BULK_REINDEX_SIZE });