Merge branch 'dev' into hohoTT-dev

2015-09-10 21:53:23 +08:00
parent 94ba74d9ee 36c9b2cb94
commit 50d709be28
12 changed files with 70 additions and 12 deletions
--- a/contest/views.py
+++ b/contest/views.py
@@ -404,8 +404,8 @@ def _cmp(x, y):
 def contest_rank_page(request, contest_id):
    contest = Contest.objects.get(id=contest_id)
    contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index")
-    result = ContestSubmission.objects.filter(contest=contest).values("user_id").annotate(
-        total_submit=Sum("total_submission_number"))
+    result = ContestSubmission.objects.filter(contest=contest).values("user_id").\
+        annotate(total_submit=Sum("total_submission_number"))
    for i in range(0, len(result)):
        # 这个人所有的提交
        submissions = ContestSubmission.objects.filter(user_id=result[i]["user_id"], contest_id=contest_id)