|
@@ -221,8 +221,8 @@ discard block |
|
|
block discarded – undo |
|
221
|
221
|
$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter); |
|
222
|
222
|
} |
|
223
|
223
|
|
|
224
|
|
- $qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc'); |
|
225
|
|
- $qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc'); |
|
|
224
|
+ $qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc'); |
|
|
225
|
+ $qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc'); |
|
226
|
226
|
|
|
227
|
227
|
return $this->getItemsFromRequest($qb); |
|
228
|
228
|
} |
|
@@ -246,8 +246,8 @@ discard block |
|
|
block discarded – undo |
|
246
|
246
|
$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId); |
|
247
|
247
|
|
|
248
|
248
|
$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS); |
|
249
|
|
- $qb->orderBy($aliasMembership . '.inheritance_depth', 'asc') |
|
250
|
|
- ->addGroupBy($aliasMembership . '.inheritance_depth'); |
|
|
249
|
+ $qb->orderBy($aliasMembership.'.inheritance_depth', 'asc') |
|
|
250
|
+ ->addGroupBy($aliasMembership.'.inheritance_depth'); |
|
251
|
251
|
|
|
252
|
252
|
return $this->getItemsFromRequest($qb); |
|
253
|
253
|
} |
|
@@ -283,7 +283,7 @@ discard block |
|
|
block discarded – undo |
|
283
|
283
|
$qb = $this->getMemberSelectSql(); |
|
284
|
284
|
$qb->limitToCircleId($circleId); |
|
285
|
285
|
|
|
286
|
|
- $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance')); |
|
|
286
|
+ $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance')); |
|
287
|
287
|
|
|
288
|
288
|
return array_map( |
|
289
|
289
|
function(Member $member): string { |
|
@@ -339,7 +339,7 @@ discard block |
|
|
block discarded – undo |
|
339
|
339
|
*/ |
|
340
|
340
|
public function searchFederatedUsers(string $needle): array { |
|
341
|
341
|
$qb = $this->getMemberSelectSql(); |
|
342
|
|
- $qb->searchInDBField('user_id', '%' . $needle . '%'); |
|
|
342
|
+ $qb->searchInDBField('user_id', '%'.$needle.'%'); |
|
343
|
343
|
|
|
344
|
344
|
return $this->getItemsFromRequest($qb, true); |
|
345
|
345
|
} |