xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hohoTT-dev' into virusdefender-dev

Browse Source 
* hohoTT-dev:
  改打开题目为当前窗口打开，并且去掉题目单页中的返回选项
  contest type 的表示类型修改为常量
  比赛描述居中，注意：后台写题目描述的时候无需空格，描述会自动居中，不然描述会偏离原来居中的方向。
This commit is contained in:
virusdefender
2015-09-11 20:37:15 +08:00
parent 9b5049b89a 81e3381c6f
commit be8b678430
10 changed files with 74 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
submission/tests.py
View File

@@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse
from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN
from problem.models import Problem
from contest.models import Contest
from contest.models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PUBLIC_CONTEST
from submission.models import Submission
from rest_framework.test import APITestCase, APIClient
@@ -82,7 +83,8 @@ class SubmissionAPITest(APITestCase):
hint="hint1",
created_by=User.objects.get(username="test2"))
self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
contest_type=2, show_rank=True, show_user_submission=True,
contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
show_user_submission=True,
start_time="2015-08-15T10:00:00.000Z",
end_time="2015-08-15T12:00:00.000Z",
password="aacc", created_by=User.objects.get(username="test2"))
@@ -151,7 +153,8 @@ class SubmissionAdminAPITest(APITestCase):
hint="hint1",
created_by=self.user)
self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
contest_type=2, show_rank=True, show_user_submission=True,
contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
show_user_submission=True,
start_time="2015-08-15T10:00:00.000Z",
end_time="2015-08-15T12:00:00.000Z",
password="aacc", created_by=self.user)
@@ -190,7 +193,8 @@ class SubmissionPageTest(TestCase):
hint="hint1",
created_by=User.objects.get(username="test1"))
self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
contest_type=2, show_rank=True, show_user_submission=True,
contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
show_user_submission=True,
start_time="2015-08-15T10:00:00.000Z",
end_time="2015-08-15T12:00:00.000Z",
password="aacc", created_by=User.objects.get(username="test1"))