Explorar o código

set showAnyoneKnowsLink when useFindOne is ture

Yuki Takei %!s(int64=3) %!d(string=hai) anos
pai
achega
0f654c6fac
Modificáronse 1 ficheiros con 4 adicións e 3 borrados
  1. 4 3
      packages/app/src/server/models/page.ts

+ 4 - 3
packages/app/src/server/models/page.ts

@@ -349,14 +349,14 @@ export class PageQueryBuilder {
   }
   }
 
 
   // add viewer condition to PageQueryBuilder instance
   // add viewer condition to PageQueryBuilder instance
-  async addViewerCondition(user, userGroups = null): Promise<PageQueryBuilder> {
+  async addViewerCondition(user, userGroups = null, showAnyoneKnowsLink = false): Promise<PageQueryBuilder> {
     let relatedUserGroups = userGroups;
     let relatedUserGroups = userGroups;
     if (user != null && relatedUserGroups == null) {
     if (user != null && relatedUserGroups == null) {
       const UserGroupRelation: any = mongoose.model('UserGroupRelation');
       const UserGroupRelation: any = mongoose.model('UserGroupRelation');
       relatedUserGroups = await UserGroupRelation.findAllUserGroupIdsRelatedToUser(user);
       relatedUserGroups = await UserGroupRelation.findAllUserGroupIdsRelatedToUser(user);
     }
     }
 
 
-    this.addConditionToFilteringByViewer(user, relatedUserGroups, false);
+    this.addConditionToFilteringByViewer(user, relatedUserGroups, showAnyoneKnowsLink);
     return this;
     return this;
   }
   }
 
 
@@ -568,9 +568,10 @@ schema.statics.findByPathAndViewer = async function(
   }
   }
 
 
   const baseQuery = useFindOne ? this.findOne({ path }) : this.find({ path });
   const baseQuery = useFindOne ? this.findOne({ path }) : this.find({ path });
+  const showAnyoneKnowsLink = useFindOne;
   const queryBuilder = new PageQueryBuilder(baseQuery, includeEmpty);
   const queryBuilder = new PageQueryBuilder(baseQuery, includeEmpty);
 
 
-  await queryBuilder.addViewerCondition(user, userGroups);
+  await queryBuilder.addViewerCondition(user, userGroups, showAnyoneKnowsLink);
 
 
   return queryBuilder.query.exec();
   return queryBuilder.query.exec();
 };
 };