Skip to content

Commit

Permalink
Merge branch 'develop' into feat/e2ee-composer-hint
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Oct 14, 2024
2 parents d38f590 + 8c8238e commit 0e08d98
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions apps/meteor/app/api/server/lib/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@ export async function findPaginatedUsersByStatus({
if (sort?.status) {
actualSort.active = sort.status;
}
if (sort?.name) {
actualSort.nameInsensitive = sort.name;
}
const match: Filter<IUser & RootFilterOperators<IUser>> = {};
switch (status) {
case 'active':
Expand Down Expand Up @@ -198,6 +195,7 @@ export async function findPaginatedUsersByStatus({
if (roles?.length && !roles.includes('all')) {
match.roles = { $in: roles };
}

const { cursor, totalCount } = await Users.findPaginated(
{
...match,
Expand Down

0 comments on commit 0e08d98

Please sign in to comment.