kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

Merge tag '2024.10.1' into feature/2024.10

Browse Source
This commit is contained in:
dakkar
2024-11-08 15:52:37 +00:00
parent 6ed38f53f5 d2e8dc4fe3
commit f079edaf3c
454 changed files with 9728 additions and 3363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/src/server/api/endpoints/admin/show-users.ts
+2 -2
View File
@@ -72,13 +72,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
break;
}
case 'moderator': {
const moderatorIds = await this.roleService.getModeratorIds(false);
const moderatorIds = await this.roleService.getModeratorIds({ includeAdmins: false });
if (moderatorIds.length === 0) return [];
query.where('user.id IN (:...moderatorIds)', { moderatorIds: moderatorIds });
break;
}
case 'adminOrModerator': {
const adminOrModeratorIds = await this.roleService.getModeratorIds();
const adminOrModeratorIds = await this.roleService.getModeratorIds({ includeAdmins: true });
if (adminOrModeratorIds.length === 0) return [];
query.where('user.id IN (:...adminOrModeratorIds)', { adminOrModeratorIds: adminOrModeratorIds });
break;