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

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

Browse Source 
Conflicts:
	template/src/oj/problem/problem.html
This commit is contained in:
sxw@401
2015-09-08 18:55:17 +08:00
parent 13b7a84c8f 453b2ea2ed
commit a3cbe157bb
30 changed files with 559 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contest/views.py
View File

@@ -320,7 +320,6 @@ def contest_problems_list_page(request, contest_id):
contest = Contest.objects.get(id=contest_id)
except Contest.DoesNotExist:
return error_page(request, u"比赛不存在")
contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index")
submissions = ContestSubmission.objects.filter(user=request.user, contest=contest)
state = {}
@@ -334,10 +333,8 @@ def contest_problems_list_page(request, contest_id):
item.state = 2
else:
item.state = 0
# 右侧的公告列表
announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems,
"announcements": announcements,
"contest": {"id": contest_id}})
@@ -419,4 +416,5 @@ def contest_rank_page(request, contest_id):
return render(request, "oj/contest/contest_rank.html",
{"contest": contest, "contest_problems": contest_problems,
"result": sorted(result, cmp=_cmp, reverse=True)})
"result": sorted(result, cmp=_cmp, reverse=True),
"auto_refresh": request.GET.get("auto_refresh", None) == "true"})