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

Merge pull request #10752 from growilabs/fix/177800-user-pages-are-displayed-in-page-list-when-disable-user-pages-is-on

fix: User pages are displayed in page list when 'Disable user pages' is on
mergify[bot] 2 месяцев назад
Родитель
Сommit
128c0bf367

+ 5 - 0
apps/app/src/server/models/obsolete-page.js

@@ -425,6 +425,11 @@ export const getPageSchema = (crowi) => {
     includeEmpty = false,
     includeEmpty = false,
   ) {
   ) {
     const builder = new this.PageQueryBuilder(this.find(), includeEmpty);
     const builder = new this.PageQueryBuilder(this.find(), includeEmpty);
+
+    if (option.disableUserPages) {
+      builder.addConditionToListByNotMatchPathAndChildren('/user');
+    }
+
     builder.addConditionToListWithDescendants(path, option);
     builder.addConditionToListWithDescendants(path, option);
 
 
     return findListFromBuilderAndViewer(builder, user, false, option);
     return findListFromBuilderAndViewer(builder, user, false, option);

+ 5 - 0
apps/app/src/server/routes/apiv3/pages/index.js

@@ -668,10 +668,15 @@ module.exports = (crowi) => {
         includeTrashed = true;
         includeTrashed = true;
       }
       }
 
 
+      const disableUserPages = configManager.getConfig(
+        'security:disableUserPages',
+      );
+
       const queryOptions = {
       const queryOptions = {
         offset,
         offset,
         limit,
         limit,
         includeTrashed,
         includeTrashed,
+        disableUserPages,
       };
       };
 
 
       try {
       try {