From 7eef07f0caade5abc1ab1db0ee42e841dcbc1396 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sat, 15 Aug 2015 20:38:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=88=A4?= =?UTF-8?q?=E9=A2=98=E8=B6=85=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/oj/problem/problem.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js index 8e107bb8..5b23c751 100644 --- a/static/src/js/app/oj/problem/problem.js +++ b/static/src/js/app/oj/problem/problem.js @@ -53,7 +53,14 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro return html; } + var counter = 0; + function getResult() { + if(counter++ > 10){ + hideLoading(); + bsAlert("抱歉，服务器可能出现了故障，请稍后到我的提交列表中查看"); + return; + } $.ajax({ url: "/api/submission/?submission_id=" + submissionId, method: "get", @@ -85,7 +92,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro showLoading(); if(!code.trim()){ - bs_alert("请填写代码！"); + bsAlert("请填写代码！"); hideLoading(); return false; } From 7e16a9feb88023a03363aee5be552a2f15b825fc Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sat, 15 Aug 2015 20:40:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20waiting=20=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8B=E9=A2=9C=E8=89=B2=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/templatetags/submission.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/templatetags/submission.py b/utils/templatetags/submission.py index a1b30ebc..86dd2d58 100644 --- a/utils/templatetags/submission.py +++ b/utils/templatetags/submission.py @@ -27,7 +27,7 @@ def translate_language(value): def translate_result_class(value): if value == 0: return "success" - elif value == "8": + elif value == 8: return "info" return "danger" From a6bd787b86bdc96ef1a65558403a4956bfd98e86 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sat, 15 Aug 2015 23:46:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20celery=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- judge/judger_controller/celery.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/judge/judger_controller/celery.py b/judge/judger_controller/celery.py index 6befedf9..5b90bdb9 100644 --- a/judge/judger_controller/celery.py +++ b/judge/judger_controller/celery.py @@ -3,8 +3,7 @@ from __future__ import absolute_import from celery import Celery from .settings import redis_config -app = Celery("judge", broker="redis://" + - redis_config["host"] + ":" + - str(redis_config["port"]) + - "/" + str(redis_config["db"]), +app = Celery("judge", broker='redis://%s:%s/%s' % (redis_config["host"], redis_config["port"], redis_config["db"]), include=["judge.judger_controller.tasks"]) + +Celery().conf.update(CELERY_ACCEPT_CONTENT = ['json']) \ No newline at end of file From 884d3ff980fceead968f64ed6c94782b222cfc68 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sat, 15 Aug 2015 23:46:40 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=A1=AC=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E7=BD=91=E7=AB=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/oj_base.html | 6 +++--- utils/templatetags/website_info.py | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 utils/templatetags/website_info.py diff --git a/template/oj_base.html b/template/oj_base.html index fd8321b0..082cad5b 100644 --- a/template/oj_base.html +++ b/template/oj_base.html @@ -16,7 +16,7 @@ {% block css_block %}{% endblock %} - +{% load website_info %} @@ -38,7 +38,7 @@ - qduoj + {% show_website_info "website_name" %}