Merge branch 'virusdefender-dev' of git.coding.net:virusdefender/qduoj into dev-s

This commit is contained in:
sxw
2015-11-30 18:13:04 +08:00
3 changed files with 10 additions and 0 deletions

View File

@@ -515,6 +515,10 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
values("id", "contest_id", "problem_id", "result", "create_time",
"accepted_answer_time", "language", "user_id").order_by("-create_time")
# 如果比赛已经开始,就不再显示之前测试题目的提交
if contest.status != CONTEST_NOT_START:
submissions = submissions.filter(create_time__gte=contest.start_time)
user_id = request.GET.get("user_id", None)
if user_id:
submissions = submissions.filter(user_id=request.GET.get("user_id"))

View File

@@ -1,6 +1,9 @@
<div ms-controller="add_contest">
<form id="add-contest-form">
<div class="col-md-9">
<div class="alert alert-warning" role="alert">
<p>注意!管理员在测试比赛题目的时候请务必保持比赛状态为没有开始,这时只有管理员可以正常查看和提交题目,而且不会产生排名。</p>
</div>
<div class="col-md-12">
<label>比赛名称</label>
</div>

View File

@@ -6,6 +6,9 @@
aria-hidden="true">&larr;</span> 返回</a></li>
</ul>
</nav>
<div class="alert alert-warning" role="alert">
<p>注意!管理员在测试比赛题目的时候请务必保持比赛状态为没有开始,这时只有管理员可以正常查看和提交题目,而且不会产生排名。</p>
</div>
<div class="col-md-12">
<label>比赛名称</label>
</div>