diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 91bcf24ee..1a13f48d5 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.28.11", + "version": "2.28.12", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts index dda0378b2..5d260fc23 100644 --- a/packages/hydrooj/src/handler/contest.ts +++ b/packages/hydrooj/src/handler/contest.ts @@ -219,8 +219,9 @@ export class ContestEditHandler extends Handler { title: string, content: string, rule: string, _pids: string, rated = false, ) { const pids = _pids.replace(/,/g, ',').split(',').map((i) => { + i = i.trim(); if ((+i).toString() === i) return +i; - return i.trim(); + return i; }).filter((i) => i); const beginAtMoment = moment.tz(`${beginAtDate} ${beginAtTime}`, this.user.timeZone); if (!beginAtMoment.isValid()) throw new ValidationError('beginAtDate', 'beginAtTime'); diff --git a/packages/hydrooj/src/handler/homework.ts b/packages/hydrooj/src/handler/homework.ts index d98eb25ee..466805f92 100644 --- a/packages/hydrooj/src/handler/homework.ts +++ b/packages/hydrooj/src/handler/homework.ts @@ -306,8 +306,9 @@ class HomeworkEditHandler extends Handler { penaltyRules: PenaltyRules, title: string, content: string, _pids: string, rated = false, ) { const pids = _pids.replace(/,/g, ',').split(',').map((i) => { + i = i.trim(); if ((+i).toString() === i) return +i; - return i.trim(); + return i; }).filter((i) => i); const tdoc = tid ? await contest.get(domainId, tid, document.TYPE_HOMEWORK) diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index f710619f2..8938831b8 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.11.5", + "version": "4.11.6", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html index 2829451cb..5f12a0d7d 100644 --- a/packages/ui-default/templates/problem_detail.html +++ b/packages/ui-default/templates/problem_detail.html @@ -12,8 +12,8 @@ }) }} {% if tdoc %} {{ set(UiContext, 'canViewRecord', model.contest.canShowRecord.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.docId, tid=tdoc.docId)) }} - {{ set(UiContext, 'getSubmissionsUrl', url('contest_detail_problem_submit' if tdoc.docType == model.document.TYPE_CONTEST else 'homework_detail_problem_submit', pid=pdoc.docId, tid=tdoc.docId)) }} + {{ 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('contest_detail_problem_submit' if tdoc.docType == model.document.TYPE_CONTEST else 'homework_detail_problem_submit', pid=pdoc.pid, tid=tdoc.docId)) }} {{ set(UiContext, 'getRecordDetailUrl', url('record_detail', rid='{rid}', query={tid:tdoc.docId})) }} {{ set(UiContext, 'pretestConnUrl', "/record-conn?pretest=1&uid=" + handler.user._id + "&pid=" + pdoc.docId + "&domainId=" + handler.domainId + "&tid=" + tdoc.docId) }} {% else %}