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&ui: fix typo

Browse Source
This commit is contained in:
undefined committed 2023-12-16 20:50:26 +08:00
1 parent 8dda281262
commit cbbe817488
8 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/src/model/builtin.ts
+3 -3
View File
@@ -12,7 +12,7 @@ export const PERM = {
// Domain Settings // Domain Settings
PERM_VIEW: 1n << 0n, PERM_VIEW: 1n << 0n,
PERM_EDIT_DOMAIN: 1n << 1n, PERM_EDIT_DOMAIN: 1n << 1n,
PREM_VIEW_DISPLAYNAME: 1n << 67n, PERM_VIEW_DISPLAYNAME: 1n << 67n,
PERM_MOD_BADGE: 1n << 2n, PERM_MOD_BADGE: 1n << 2n,
// Problem // Problem
@@ -104,7 +104,7 @@ export const Permission = (family: string, key: BigInt, desc: string) => ({ fami
export const PERMS = [ export const PERMS = [
Permission('perm_general', PERM.PERM_VIEW, 'View this domain'), Permission('perm_general', PERM.PERM_VIEW, 'View this domain'),
Permission('perm_general', PERM.PREM_VIEW_DISPLAYNAME, 'View domain user displayname'), Permission('perm_general', PERM.PERM_VIEW_DISPLAYNAME, 'View domain user displayname'),
Permission('perm_general', PERM.PERM_EDIT_DOMAIN, 'Edit domain settings'), Permission('perm_general', PERM.PERM_EDIT_DOMAIN, 'Edit domain settings'),
Permission('perm_general', PERM.PERM_MOD_BADGE, 'Show MOD badge'), Permission('perm_general', PERM.PERM_MOD_BADGE, 'Show MOD badge'),
Permission('perm_problem', PERM.PERM_CREATE_PROBLEM, 'Create problems'), Permission('perm_problem', PERM.PERM_CREATE_PROBLEM, 'Create problems'),
@@ -188,7 +188,7 @@ PERM.PERM_BASIC = PERM.PERM_VIEW
| PERM.PERM_VIEW_RANKING; | PERM.PERM_VIEW_RANKING;
PERM.PERM_DEFAULT = PERM.PERM_VIEW PERM.PERM_DEFAULT = PERM.PERM_VIEW
| PERM.PREM_VIEW_DISPLAYNAME | PERM.PERM_VIEW_DISPLAYNAME
| PERM.PERM_VIEW_PROBLEM | PERM.PERM_VIEW_PROBLEM
| PERM.PERM_EDIT_PROBLEM_SELF | PERM.PERM_EDIT_PROBLEM_SELF
| PERM.PERM_SUBMIT_PROBLEM | PERM.PERM_SUBMIT_PROBLEM
packages/hydrooj/src/service/layers/renderer.ts
+1 -1
View File
@@ -16,7 +16,7 @@ export default (router, logger) => async (ctx: KoaContext, next) => {
}; };
const engine = global.Hydro.lib.template?.render const engine = global.Hydro.lib.template?.render
|| (() => JSON.stringify(args, serializer({ || (() => JSON.stringify(args, serializer({
showDisplayName: user?.hasPerm(PERM.PREM_VIEW_DISPLAYNAME), showDisplayName: user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME),
}))); })));
return engine(templateName, { return engine(templateName, {
handler: ctx.handler, handler: ctx.handler,
packages/hydrooj/src/service/layers/response.ts
+1 -1
View File
@@ -27,7 +27,7 @@ export default (logger) => async (ctx: KoaContext, next) => {
response.body.UiContext = UiContext; response.body.UiContext = UiContext;
response.body.UserContext = user; response.body.UserContext = user;
} }
response.body = JSON.stringify(response.body, serializer({ showDisplayName: user?.hasPerm(PERM.PREM_VIEW_DISPLAYNAME) })); response.body = JSON.stringify(response.body, serializer({ showDisplayName: user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME) }));
} catch (e) { } catch (e) {
response.body = new SystemError('Serialize failure', e.message); response.body = new SystemError('Serialize failure', e.message);
} }
packages/hydrooj/src/service/server.ts
+1 -1
View File
@@ -348,7 +348,7 @@ export class ConnectionHandler extends HandlerCommon {
send(data: any) { send(data: any) {
this.conn.send(JSON.stringify(data, serializer({ this.conn.send(JSON.stringify(data, serializer({
showDisplayName: this.user?.hasPerm(PERM.PREM_VIEW_DISPLAYNAME), showDisplayName: this.user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME),
}))); })));
} }
packages/hydrooj/src/upgrade.ts
+1 -1
View File
@@ -436,7 +436,7 @@ const scripts: UpgradeScript[] = [
return await iterateAllDomain(async (ddoc) => { return await iterateAllDomain(async (ddoc) => {
for (const role of Object.keys(ddoc.roles)) { for (const role of Object.keys(ddoc.roles)) {
if (['guest', 'root'].includes(role)) return; if (['guest', 'root'].includes(role)) return;
ddoc.roles[role] = (BigInt(ddoc.roles[role]) | PERM.PREM_VIEW_DISPLAYNAME).toString(); ddoc.roles[role] = (BigInt(ddoc.roles[role]) | PERM.PERM_VIEW_DISPLAYNAME).toString();
} }
await domain.setRoles(ddoc._id, ddoc.roles); await domain.setRoles(ddoc._id, ddoc.roles);
}); });
packages/ui-default/templates/components/user.html
+1 -1
View File
@@ -5,7 +5,7 @@
<img class="small user-profile-avatar v-center" loading="lazy" src="{{ avatarUrl(udoc.avatar|default('')) }}" width="20" height="20"> <img class="small user-profile-avatar v-center" loading="lazy" src="{{ avatarUrl(udoc.avatar|default('')) }}" width="20" height="20">
{% endif %} {% endif %}
<a class="user-profile-name" href="{{ url('user_detail', uid=udoc._id) }}"> <a class="user-profile-name" href="{{ url('user_detail', uid=udoc._id) }}">
{% if handler.user.hasPerm(perm.PREM_VIEW_DISPLAYNAME) and udoc.displayName and udoc.displayName != udoc.uname %} {% if handler.user.hasPerm(perm.PERM_VIEW_DISPLAYNAME) and udoc.displayName and udoc.displayName != udoc.uname %}
{{ udoc.displayName }} ({{ udoc.uname }}) {{ udoc.displayName }} ({{ udoc.uname }})
{% else %} {% else %}
{{ udoc.uname }} {{ udoc.uname }}
packages/ui-default/templates/record_main_tr.html
+1 -1
View File
@@ -28,7 +28,7 @@
</td> </td>
<td class="col--submit-by"> <td class="col--submit-by">
<a href="{{ url('user_detail', uid=rdoc.uid) }}"> <a href="{{ url('user_detail', uid=rdoc.uid) }}">
{% if handler.user.hasPerm(perm.PREM_VIEW_DISPLAYNAME) and udoc.displayName %} {% if handler.user.hasPerm(perm.PERM_VIEW_DISPLAYNAME) and udoc.displayName %}
{{ udoc.displayName }} ({{ udoc.uname }}) {{ udoc.displayName }} ({{ udoc.uname }})
{% else %} {% else %}
{{ udoc.uname }} {{ udoc.uname }}
packages/ui-default/templates/training_detail.html
+2 -2
View File
@@ -18,12 +18,12 @@
</li> </li>
<ul class="enroll_user_menu"> <ul class="enroll_user_menu">
{%- for uid, udoc in udict -%} {%- for uid, udoc in udict -%}
<li class="menu__item enroll_user_menu_item" data-uid="{{ uid }}" data-uname="{{ udoc.uname }}" {% if handler.user.hasPerm(perm.PREM_VIEW_DISPLAYNAME) and udoc.displayName %}data-displayname="{{ udoc.displayName }}"{% endif %}> <li class="menu__item enroll_user_menu_item" data-uid="{{ uid }}" data-uname="{{ udoc.uname }}" {% if handler.user.hasPerm(perm.PERM_VIEW_DISPLAYNAME) and udoc.displayName %}data-displayname="{{ udoc.displayName }}"{% endif %}>
<a href="./{{ tdoc._id }}?uid={{ uid }}" class="menu__link{% if (handler.request.query.uid or handler.user._id) == uid %} active{% endif %}"> <a href="./{{ tdoc._id }}?uid={{ uid }}" class="menu__link{% if (handler.request.query.uid or handler.user._id) == uid %} active{% endif %}">
<span class="user-profile-link"> <span class="user-profile-link">
<img class="small user-profile-avatar v-center" loading="lazy" src="{{ avatarUrl(udoc.avatar|default('')) }}" width="20" height="20"> <img class="small user-profile-avatar v-center" loading="lazy" src="{{ avatarUrl(udoc.avatar|default('')) }}" width="20" height="20">
<span class="user-profile-name"> <span class="user-profile-name">
{% if handler.user.hasPerm(perm.PREM_VIEW_DISPLAYNAME) and udoc.displayName and udoc.displayName != udoc.uname %} {% if handler.user.hasPerm(perm.PERM_VIEW_DISPLAYNAME) and udoc.displayName and udoc.displayName != udoc.uname %}
{{ udoc.displayName }} ({{ udoc.uname }}) {{ udoc.displayName }} ({{ udoc.uname }})
{% else %} {% else %}
{{ udoc.uname }} {{ udoc.uname }}