From f8677f4966e6f7d5b2c61d487bda1b6c335f58a8 Mon Sep 17 00:00:00 2001 From: esp Date: Thu, 27 Aug 2015 22:26:00 +0800 Subject: [PATCH 01/10] =?UTF-8?q?[=E5=90=8E=E7=AB=AF-=E5=89=8D=E5=8F=B0]?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=B3=A8=E9=94=80=E5=8A=9F?= =?UTF-8?q?=E8=83=BD,=E8=BF=99=E4=B8=AA=E5=B9=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=81=9A=E6=88=90api,=E6=84=9F=E8=A7=89=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E5=81=9A=E6=88=90api=E5=8F=AF=E8=83=BD=E6=B2=A1=E4=BB=80?= =?UTF-8?q?=E4=B9=88=E5=BF=85=E8=A6=81...=E6=89=80=E4=BB=A5=E5=B9=B2?= =?UTF-8?q?=E8=84=86=E5=86=99=E4=BA=86=E5=9C=B0=E5=9D=80=E9=87=8D=E5=AE=9A?= =?UTF-8?q?=E5=90=91=E5=88=B0=E9=A6=96=E9=A1=B5=E4=BA=86,=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=80=9A=E8=BF=87account.tests.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/tests.py | 15 +++++++++++++++ account/views.py | 5 +++++ oj/urls.py | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/account/tests.py b/account/tests.py index a75d2c5..f8cc9d0 100644 --- a/account/tests.py +++ b/account/tests.py @@ -369,3 +369,18 @@ class AdminRequiredDecoratorTest(TestCase): self.client.login(username="test", password="test") response = self.client.get("/admin_required_test/cbv/1024/") self.assertEqual(response.content, "1024") + + +class UserLogoutTest(TestCase): + def setUp(self): + self.client = Client() + user = User.objects.create(username="test") + user.admin_type = 1 + user.set_password("1") + user.save() + + def logout_success(self): + self.client = Client() + self.client.login(username="test", password="1") + response = self.client.get("/logout/") + self.assertEqual(response.status_code, 302) diff --git a/account/views.py b/account/views.py index f2c6ca3..c1f0cb9 100644 --- a/account/views.py +++ b/account/views.py @@ -1,4 +1,5 @@ # coding=utf-8 +from django import http from django.contrib import auth from django.shortcuts import render from django.db.models import Q @@ -35,6 +36,10 @@ class UserLoginAPIView(APIView): return serializer_invalid_response(serializer) +def Logout(request): + auth.logout(request) + return http.HttpResponseRedirect("/") + class UserRegisterAPIView(APIView): def post(self, request): """ diff --git a/oj/urls.py b/oj/urls.py index 74a44c2..aeab5b2 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -5,7 +5,7 @@ from django.views.generic import TemplateView from account.views import (UserLoginAPIView, UsernameCheckAPIView, UserRegisterAPIView, UserChangePasswordAPIView, EmailCheckAPIView, - UserAdminAPIView, UserInfoAPIView) + UserAdminAPIView, UserInfoAPIView, Logout) from announcement.views import AnnouncementAdminAPIView from contest.views import ContestAdminAPIView, ContestProblemAdminAPIView, ContestPasswordVerifyAPIView @@ -34,6 +34,7 @@ urlpatterns = [ name="admin_template"), url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"), + url(r'^logout/$', Logout, name="user_logout_api"), url(r'^register/$', TemplateView.as_view(template_name="oj/account/register.html"), name="user_register_page"), url(r'^change_password/$', TemplateView.as_view(template_name="oj/account/change_password.html"), From abd7933a5a4e23ad7175966201da0d9679da32fe Mon Sep 17 00:00:00 2001 From: esp Date: Thu, 27 Aug 2015 22:28:30 +0800 Subject: [PATCH 02/10] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/contest/contest_list.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/template/src/oj/contest/contest_list.html b/template/src/oj/contest/contest_list.html index 1689cee..68d939b 100644 --- a/template/src/oj/contest/contest_list.html +++ b/template/src/oj/contest/contest_list.html @@ -3,7 +3,7 @@ {% load contest %}
-
+
@@ -15,6 +15,7 @@
+ {% if contests %} @@ -47,6 +48,7 @@ {% endfor %}
+
-
+
{% include "oj/announcement/_announcement_panel.html" %}
From f04951f9a181b15b2944097e078d5c78d1d68a04 Mon Sep 17 00:00:00 2001 From: esp Date: Thu, 27 Aug 2015 22:30:55 +0800 Subject: [PATCH 03/10] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=89=8D=E5=8F=B0=E9=A1=B5=E9=9D=A2=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?= =?UTF-8?q?,=E5=AE=8C=E6=88=90=E6=B3=A8=E9=94=80=E5=8A=9F=E8=83=BD,?= =?UTF-8?q?=E5=9C=A8=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/account/login.html | 46 +++++++++++++++++------------- template/src/oj_base.html | 46 ++++++++++++++++-------------- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/template/src/oj/account/login.html b/template/src/oj/account/login.html index 2f5f7cf..5777fd3 100644 --- a/template/src/oj/account/login.html +++ b/template/src/oj/account/login.html @@ -1,27 +1,33 @@ {% extends "oj_base.html" %} {% block body %} -
-
-

用户登录

+
+
+

用户登录

- -
- - -
-
-
- - -
-
-
- -
- -
+
+
+ + + +
+
+
+ + + +
+
+
+ +
+ 还没有帐号?点击注册 + +
+
{% endblock %} {% block js_block %} - + {% endblock %} \ No newline at end of file diff --git a/template/src/oj_base.html b/template/src/oj_base.html index 082cad5..be8f3b0 100644 --- a/template/src/oj_base.html +++ b/template/src/oj_base.html @@ -48,28 +48,28 @@
  • 关于
    • {% if request.user.is_authenticated %} - + {% else %} - + {% endif %}
    @@ -84,6 +84,10 @@ {% block js_block %}{% endblock %} From 8ae8fd246abf7500982405c253d83541b011e2d4 Mon Sep 17 00:00:00 2001 From: esp Date: Fri, 28 Aug 2015 17:11:40 +0800 Subject: [PATCH 04/10] =?UTF-8?q?[=E5=90=8E=E7=AB=AF-=E5=89=8D=E5=8F=B0]?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=94=E8=B5=9B=E5=88=97=E8=A1=A8=E4=BB=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=AF=E5=8F=82=E5=8A=A0=E7=9A=84=E6=AF=94?= =?UTF-8?q?=E8=B5=9B=E7=9A=84=E9=97=AE=E9=A2=98,=E5=B0=8Fbug,=E5=90=A6?= =?UTF-8?q?=E5=88=99=E9=80=89=E6=8B=A9=E6=9F=A5=E7=9C=8B=E5=8F=AF=E5=8F=82?= =?UTF-8?q?=E5=8A=A0=E7=9A=84=E6=AF=94=E8=B5=9B=E6=9C=89=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=8F=AF=E8=A7=81=E7=9A=84=E6=AF=94?= =?UTF-8?q?=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contest/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contest/views.py b/contest/views.py index e23b50e..4763bd8 100644 --- a/contest/views.py +++ b/contest/views.py @@ -348,7 +348,7 @@ def contest_list_page(request, page=1): # 筛选我能参加的比赛 join = request.GET.get("join", None) if join: - contests = Contest.objects.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\ + contests = contests.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\ filter(end_time__gt=datetime.datetime.now(), start_time__lt=datetime.datetime.now()) paginator = Paginator(contests, 20) From e14eaada4f8345a3138428dd2400684a549698f1 Mon Sep 17 00:00:00 2001 From: esp Date: Fri, 28 Aug 2015 17:12:41 +0800 Subject: [PATCH 05/10] =?UTF-8?q?[=E5=90=8E=E7=AB=AF]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B3=A8=E9=94=80views=E7=9A=84=E5=87=BD=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/views.py | 2 +- oj/urls.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/account/views.py b/account/views.py index c1f0cb9..89197ae 100644 --- a/account/views.py +++ b/account/views.py @@ -36,7 +36,7 @@ class UserLoginAPIView(APIView): return serializer_invalid_response(serializer) -def Logout(request): +def logout(request): auth.logout(request) return http.HttpResponseRedirect("/") diff --git a/oj/urls.py b/oj/urls.py index aeab5b2..a623784 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -5,7 +5,7 @@ from django.views.generic import TemplateView from account.views import (UserLoginAPIView, UsernameCheckAPIView, UserRegisterAPIView, UserChangePasswordAPIView, EmailCheckAPIView, - UserAdminAPIView, UserInfoAPIView, Logout) + UserAdminAPIView, UserInfoAPIView) from announcement.views import AnnouncementAdminAPIView from contest.views import ContestAdminAPIView, ContestProblemAdminAPIView, ContestPasswordVerifyAPIView @@ -34,7 +34,7 @@ urlpatterns = [ name="admin_template"), url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"), - url(r'^logout/$', Logout, name="user_logout_api"), + url(r'^logout/$', "account.views.logout", name="user_logout_api"), url(r'^register/$', TemplateView.as_view(template_name="oj/account/register.html"), name="user_register_page"), url(r'^change_password/$', TemplateView.as_view(template_name="oj/account/change_password.html"), From 4847a3a36c0042d3bab7deeaa277c107dc02869c Mon Sep 17 00:00:00 2001 From: esp Date: Fri, 28 Aug 2015 17:56:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E7=9A=84=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- submission/views.py | 13 ++- .../oj/submission/my_submissions_list.html | 89 ++++++++++--------- 2 files changed, 56 insertions(+), 46 deletions(-) diff --git a/submission/views.py b/submission/views.py index 17c1615..12c4ec4 100644 --- a/submission/views.py +++ b/submission/views.py @@ -12,15 +12,14 @@ from judge.judger_controller.settings import redis_config from account.decorators import login_required from account.models import SUPER_ADMIN -from contest.decorators import check_user_contest_permission from problem.models import Problem -from contest.models import Contest, ContestProblem +from contest.models import ContestProblem from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate from .models import Submission from .serializers import CreateSubmissionSerializer, SubmissionSerializer - +from announcement.models import Announcement class SubmissionAPIView(APIView): @login_required @@ -80,8 +79,10 @@ def problem_my_submissions_list_page(request, problem_id): problem = Problem.objects.get(id=problem_id, visible=True) except Problem.DoesNotExist: return error_page(request, u"问题不存在") + submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id, contest_id__isnull=True).order_by("-create_time"). \ values("id", "result", "create_time", "accepted_answer_time", "language") + return render(request, "oj/problem/my_submissions_list.html", {"submissions": submissions, "problem": problem}) @@ -154,6 +155,10 @@ def my_submission_list_page(request, page=1): except Exception: pass + # 右侧的公告列表 + announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time") + return render(request, "oj/submission/my_submissions_list.html", {"submissions": current_page, "page": int(page), - "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20}) \ No newline at end of file + "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20, + "announcements": announcements}) \ No newline at end of file diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html index 279bee6..2f28bd8 100644 --- a/template/src/oj/submission/my_submissions_list.html +++ b/template/src/oj/submission/my_submissions_list.html @@ -2,57 +2,62 @@ {% block body %} - {% load submission %} -
    +{% load submission %} +
    +
    {% if submissions %} - - - - - - - - - - - - {% for item in submissions %} - - - - - - - - {% endfor %} +
    #提交时间结果运行时间语言
    - {{ forloop.counter |add:start_id }}{{ item.create_time }}{{ item.result|translate_result }} - {% if item.accepted_answer_time %} - {{ item.accepted_answer_time }}ms - {% else %} - -- - {% endif %} - - {{ item.language|translate_language }} -
    + + + + + + + + + + + {% for item in submissions %} + + + + + + + + {% endfor %} - -
    #提交时间结果运行时间语言
    + {{ forloop.counter |add:start_id }}{{ item.create_time }}{{ item.result|translate_result }} + {% if item.accepted_answer_time %} + {{ item.accepted_answer_time }}ms + {% else %} + -- + {% endif %} + + {{ item.language|translate_language }} +
    - {% else %} -

    你还没有提交记录!

    - {% endif %} + + + {% else %} +

    你还没有提交记录!

    + {% endif %}
    +
    + {% include "oj/announcement/_announcement_panel.html" %} +
    +
    {% endblock %} From 4bfbaf249f9b932dbb4e41728f97a48ecbd6f02f Mon Sep 17 00:00:00 2001 From: esp Date: Fri, 28 Aug 2015 18:02:12 +0800 Subject: [PATCH 07/10] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E6=A8=A1=E5=9D=97=E9=87=8Crank,submission?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=97=E8=A1=A8=E6=98=AF=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E7=9A=84=E6=8F=90=E7=A4=BA(?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/announcement/_announcement_panel.html | 11 ++++++++--- template/src/oj/contest/contest_problems_list.html | 4 ++-- template/src/oj/contest/contest_rank.html | 4 ++++ template/src/oj/problem/my_submissions_list.html | 4 ++++ template/src/oj/problem/problem_list.html | 4 ++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/template/src/oj/announcement/_announcement_panel.html b/template/src/oj/announcement/_announcement_panel.html index f17a9ce..d593626 100644 --- a/template/src/oj/announcement/_announcement_panel.html +++ b/template/src/oj/announcement/_announcement_panel.html @@ -5,8 +5,13 @@ 公告
    - {% for item in announcements %} -

    {{ forloop.counter }}.  {{ item.title }}

    - {% endfor %} + {% if announcements %} + {% for item in announcements %} +

    {{ forloop.counter }}.  {{ item.title }} +

    + {% endfor %} + {% else %} +

    暂无可显示的公告

    + {% endif %}
    \ No newline at end of file diff --git a/template/src/oj/contest/contest_problems_list.html b/template/src/oj/contest/contest_problems_list.html index 2a863dd..0289592 100644 --- a/template/src/oj/contest/contest_problems_list.html +++ b/template/src/oj/contest/contest_problems_list.html @@ -26,7 +26,7 @@
    -
    +
    @@ -55,7 +55,7 @@ -
    +
    {% include "oj/announcement/_announcement_panel.html" %}
    diff --git a/template/src/oj/contest/contest_rank.html b/template/src/oj/contest/contest_rank.html index 823b021..7d17134 100644 --- a/template/src/oj/contest/contest_rank.html +++ b/template/src/oj/contest/contest_rank.html @@ -20,6 +20,7 @@
    + {% if result %}
    @@ -49,6 +50,9 @@ {% endfor %}
    + {% else %} +

    还没有结果

    + {% endif %}
    diff --git a/template/src/oj/problem/my_submissions_list.html b/template/src/oj/problem/my_submissions_list.html index fb07a4c..03d7e8c 100644 --- a/template/src/oj/problem/my_submissions_list.html +++ b/template/src/oj/problem/my_submissions_list.html @@ -11,6 +11,7 @@ 我的提交 {% include "oj/problem/_problem_header.html" %} + {% if submissions %} @@ -42,5 +43,8 @@
    + {% else %} +

    你还没有提交该题目

    + {% endif %}
    {% endblock %} \ No newline at end of file diff --git a/template/src/oj/problem/problem_list.html b/template/src/oj/problem/problem_list.html index a26ae80..247b07f 100644 --- a/template/src/oj/problem/problem_list.html +++ b/template/src/oj/problem/problem_list.html @@ -3,7 +3,7 @@ {% load problem %}
    -
    +
    @@ -54,7 +54,7 @@
    -
    +
    {% include "oj/announcement/_announcement_panel.html" %}
    From 6d4d44430f6bff28c511337104ca7760ffd56b4d Mon Sep 17 00:00:00 2001 From: esp Date: Fri, 28 Aug 2015 20:27:47 +0800 Subject: [PATCH 08/10] =?UTF-8?q?[=E5=90=8E=E7=AB=AF]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD,=E6=8C=89=E8=AF=AD=E8=A8=80,=E9=A2=98=E7=9B=AE,?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=98=E6=B2=A1=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- submission/views.py | 11 +++++- .../oj/submission/my_submissions_list.html | 34 ++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/submission/views.py b/submission/views.py index 12c4ec4..5c90aca 100644 --- a/submission/views.py +++ b/submission/views.py @@ -140,6 +140,15 @@ def my_submission_list_page(request, page=1): """ submissions = Submission.objects.filter(user_id=request.user.id). \ values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time") + language = request.GET.get("language", None) + filter = None + if language: + submissions = submissions.filter(language=int(language)) + filter = {"name": "language", "content": language} + result = request.GET.get("result", None) + if result: + submissions = submissions.filter(result=int(result)) + filter = {"name": "result", "content": result} paginator = Paginator(submissions, 20) try: current_page = paginator.page(int(page)) @@ -161,4 +170,4 @@ def my_submission_list_page(request, page=1): return render(request, "oj/submission/my_submissions_list.html", {"submissions": current_page, "page": int(page), "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20, - "announcements": announcements}) \ No newline at end of file + "announcements": announcements, "filter":filter}) \ No newline at end of file diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html index 2f28bd8..f49060b 100644 --- a/template/src/oj/submission/my_submissions_list.html +++ b/template/src/oj/submission/my_submissions_list.html @@ -8,12 +8,36 @@ {% if submissions %} - + - + - + @@ -42,12 +66,12 @@ From f2a8c437de60677dde3e229684eadb3cca47da0c Mon Sep 17 00:00:00 2001 From: esp Date: Sat, 29 Aug 2015 08:33:38 +0800 Subject: [PATCH 09/10] =?UTF-8?q?[=E5=90=8E=E7=AB=AF]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=98=A8=E5=A4=A9=E4=BF=AE=E6=94=B9=E7=9A=84=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=B5=8B=E8=AF=95,=E5=85=A8=E8=A6=86=E7=9B=96=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- submission/tests.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/submission/tests.py b/submission/tests.py index 04f0a86..3aab246 100644 --- a/submission/tests.py +++ b/submission/tests.py @@ -29,6 +29,16 @@ class SubmissionsListPageTest(TestCase): response = self.client.get('/submissions/1/') self.assertEqual(response.status_code, 200) + def test_visit_submissionsListPage_successfully_language_filter(self): + self.client.login(username="gogoing", password="666666") + response = self.client.get('/submissions/?language=1') + self.assertEqual(response.status_code, 200) + + def test_visit_submissionsListPage_successfully_result_filter(self): + self.client.login(username="gogoing", password="666666") + response = self.client.get('/submissions/?result=1') + self.assertEqual(response.status_code, 200) + def test_visit_submissionsListPage_without_page_successfully(self): self.client.login(username="gogoing", password="666666") response = self.client.get('/submissions/') @@ -137,10 +147,3 @@ class ContestSubmissionAPITest(APITestCase): data = {"language": 1} response = self.client.post(self.url, data=data) pass - - - - - - - From cfaac4f5a245ca7504edd51af466c2759ba5345b Mon Sep 17 00:00:00 2001 From: esp Date: Sat, 29 Aug 2015 09:34:46 +0800 Subject: [PATCH 10/10] =?UTF-8?q?[=E5=90=8E=E7=AB=AF]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F,=E6=96=B9=E4=BE=BF=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oj/urls.py | 2 +- template/src/oj/submission/my_submissions_list.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/oj/urls.py b/oj/urls.py index a623784..b3f6929 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -1,11 +1,11 @@ # coding=utf-8 from django.conf.urls import include, url -from django.contrib import admin from django.views.generic import TemplateView from account.views import (UserLoginAPIView, UsernameCheckAPIView, UserRegisterAPIView, UserChangePasswordAPIView, EmailCheckAPIView, UserAdminAPIView, UserInfoAPIView) + from announcement.views import AnnouncementAdminAPIView from contest.views import ContestAdminAPIView, ContestProblemAdminAPIView, ContestPasswordVerifyAPIView diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html index f49060b..e048ab9 100644 --- a/template/src/oj/submission/my_submissions_list.html +++ b/template/src/oj/submission/my_submissions_list.html @@ -5,7 +5,6 @@ {% load submission %}
    - {% if submissions %}
    # 提交时间结果
    + + 结果 + +
    +     		运行时间语言
    + + 语言 + +
    +
    @@ -76,7 +75,7 @@ {% endif %} - {% else %} + {% if not submissions %}

    你还没有提交记录!

    {% endif %}