From 4dd428ba357b0eb15b105f5a1adbc802de6cfd05 Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 5 Aug 2021 15:50:16 +0800 Subject: [PATCH] core: use canShowSelfRecord --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/contest.ts | 4 ++-- packages/hydrooj/src/handler/homework.ts | 4 ++-- packages/ui-default/package.json | 2 +- packages/ui-default/templates/contest_detail.html | 2 +- packages/ui-default/templates/homework_detail.html | 2 +- packages/ui-default/templates/problem_detail.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 7846546ce..e22afced1 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.30.12", + "version": "2.30.13", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts index 026b5b11a..54792609f 100644 --- a/packages/hydrooj/src/handler/contest.ts +++ b/packages/hydrooj/src/handler/contest.ts @@ -60,7 +60,7 @@ export class ContestDetailHandler extends Handler { if (tsdoc) { attended = tsdoc.attend === 1; for (const pdetail of tsdoc.journal || []) psdict[pdetail.pid] = pdetail; - if (contest.canShowRecord.call(this, tdoc)) { + if (contest.canShowSelfRecord.call(this, tdoc)) { const q = []; for (const i in psdict) q.push(psdict[i].rid); rdict = await record.getList(domainId, q, true); @@ -373,7 +373,7 @@ export class ContestDetailProblemSubmitHandler extends ContestProblemHandler { ]); } bus.boardcast('record/change', rdoc); - if (!pretest && !contest.canShowRecord.call(this, this.tdoc)) { + if (!pretest && !contest.canShowSelfRecord.call(this, this.tdoc)) { this.response.body = { tid }; this.response.redirect = this.url('contest_detail', { tid }); } else { diff --git a/packages/hydrooj/src/handler/homework.ts b/packages/hydrooj/src/handler/homework.ts index 893b85e73..c52149394 100644 --- a/packages/hydrooj/src/handler/homework.ts +++ b/packages/hydrooj/src/handler/homework.ts @@ -68,7 +68,7 @@ class HomeworkDetailHandler extends Handler { psdict[pdetail.pid] = pdetail; rdict[pdetail.rid] = { _id: pdetail.rid }; } - if (contest.canShowRecord.call(this, tdoc) && tsdoc.journal) { + if (contest.canShowSelfRecord.call(this, tdoc) && tsdoc.journal) { rdict = await record.getList( domainId, tsdoc.journal.map((pdetail) => pdetail.rid), @@ -243,7 +243,7 @@ class HomeworkDetailProblemSubmitHandler extends HomeworkDetailProblemHandler { bus.boardcast('record/change', rdoc); this.response.body.tid = tid; this.response.body.rid = rid; - if (pretest || contest.canShowRecord.call(this, this.tdoc)) this.response.redirect = this.url('record_detail', { rid }); + if (pretest || contest.canShowSelfRecord.call(this, this.tdoc)) this.response.redirect = this.url('record_detail', { rid }); else this.response.redirect = this.url('homework_detail', { tid }); } } diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index ac7e0371f..d8084f11d 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.14.11", + "version": "4.14.12", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/contest_detail.html b/packages/ui-default/templates/contest_detail.html index 3146c8ff1..fd962ccb8 100644 --- a/packages/ui-default/templates/contest_detail.html +++ b/packages/ui-default/templates/contest_detail.html @@ -45,7 +45,7 @@ {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} {% if psdict[pid] and psdict[pid].rid %} {% set rdoc = rdict[psdict[pid].rid] %} - {% if model.contest.canShowRecord.call(handler, tdoc) %} + {% if model.contest.canShowSelfRecord.call(handler, tdoc) %} {{ record.render_status_td(rdoc) }} {% else %} {{ _('Submitted') }} diff --git a/packages/ui-default/templates/homework_detail.html b/packages/ui-default/templates/homework_detail.html index d1ede40ab..d51dec1da 100644 --- a/packages/ui-default/templates/homework_detail.html +++ b/packages/ui-default/templates/homework_detail.html @@ -44,7 +44,7 @@ {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} {% if psdict[pid] and psdict[pid].rid %} {% set rdoc = rdict[psdict[pid].rid] %} - {% if model.contest.canShowRecord.call(handler, tdoc) %} + {% if model.contest.canShowSelfRecord.call(handler, tdoc) %} {{ record.render_status_td(rdoc) }} {% else %} {{ _('Submitted') }} diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html index b6190b0b5..daf599e3a 100644 --- a/packages/ui-default/templates/problem_detail.html +++ b/packages/ui-default/templates/problem_detail.html @@ -10,7 +10,7 @@ pdoc: pdoc }) }} {% if tdoc %} - {{ set(UiContext, 'canViewRecord', model.contest.canShowRecord.call(handler, tdoc)) }} + {{ set(UiContext, 'canViewRecord', model.contest.canShowSelfRecord.call(handler, tdoc)) }} {{ set(UiContext, 'postSubmitUrl', url('contest_detail_problem_submit' if tdoc.docType == model.document.TYPE_CONTEST else 'homework_detail_problem_submit', pid=pdoc.pid, tid=tdoc.docId)) }} {{ set(UiContext, 'getSubmissionsUrl', url('record_main', query={fullStatus:'true', pid:pdoc.pid, tid:tdoc.docId})) }} {{ set(UiContext, 'getRecordDetailUrl', url('record_detail', rid='{rid}', query={tid:tdoc.docId})) }}