Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: fix showDefaultRole flag

Browse Source
This commit is contained in:
undefined committed 2026-05-08 05:33:16 +08:00
1 parent 2e82c8f15a
commit aea095b356
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
packages/hydrooj/src/handler/domain.ts
+4 -4
View File
@@ -103,13 +103,13 @@ class DomainUserHandler extends ManageHandler {
@requireSudo @requireSudo
@param('format', Types.Range(['default', 'raw']), true) @param('format', Types.Range(['default', 'raw']), true)
async get({ domainId }, format = 'default') { async get({ domainId }, format = 'default') {
const showDefault = system.get('server.showDefaultRole'); const showDefault = system.get('server.showDefaultRole') || domainId !== 'system';
const [dudocs, roles] = await Promise.all([ const [dudocs, roles] = await Promise.all([
domain.collUser.aggregate([ domain.collUser.aggregate([
{ {
$match: { $match: {
role: { role: showDefault ? { $ne: 'guest' } : {
$nin: (showDefault || domainId !== 'system') ? ['guest'] : ['default', 'guest'], $nin: ['default', 'guest'],
$ne: null, $ne: null,
}, },
domainId, domainId,
@@ -158,7 +158,7 @@ class DomainUserHandler extends ManageHandler {
return u; return u;
}); });
const rudocs = {}; const rudocs = {};
for (const role of roles) rudocs[role._id] = users.filter((udoc) => udoc.role === role._id); for (const role of roles) rudocs[role._id] = users.filter((udoc) => (udoc.role || 'default') === role._id);
this.response.template = format === 'raw' ? 'domain_user_raw.html' : 'domain_user.html'; this.response.template = format === 'raw' ? 'domain_user_raw.html' : 'domain_user.html';
this.response.body = { this.response.body = {
roles, rudocs, domain: this.domain, roles, rudocs, domain: this.domain,