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

修复比赛所有题目列表页面上显示了隐藏问题的 bug

Browse Source
This commit is contained in:
virusdefender
2015-11-06 22:15:32 +08:00
parent de870fffb2
commit 2bfa1aedc0
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
contest/views.py
View File

@@ -264,7 +264,7 @@ class ContestProblemAdminAPIView(APIView):
keyword = request.GET.get("keyword", None) keyword = request.GET.get("keyword", None)
if keyword: if keyword:
contest_problems = contest_problems.filter(Q(title__contains=keyword) | contest_problems = contest_problems.filter(Q(title__contains=keyword) |
Q(description__contains=keyword)) Q(description__contains=keyword))
contest_id = request.GET.get("contest_id", None) contest_id = request.GET.get("contest_id", None)
if contest_id: if contest_id:
contest_problems = contest_problems.filter(contest__id=contest_id).order_by("sort_index") contest_problems = contest_problems.filter(contest__id=contest_id).order_by("sort_index")
@@ -291,7 +291,6 @@ class MakeContestProblemPublicAPIView(APIView):
return success_response(u"创建成功") return success_response(u"创建成功")
class ContestPasswordVerifyAPIView(APIView): class ContestPasswordVerifyAPIView(APIView):
@login_required @login_required
def post(self, request): def post(self, request):
@@ -374,7 +373,7 @@ def contest_problems_list_page(request, contest_id):
比赛所有题目的列表页 比赛所有题目的列表页
""" """
contest = Contest.objects.get(id=contest_id) contest = Contest.objects.get(id=contest_id)
contest_problems = ContestProblem.objects.filter(contest=contest).select_related("contest").order_by("sort_index") contest_problems = ContestProblem.objects.filter(contest=contest, visible=True).select_related("contest").order_by("sort_index")
return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems, return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems,
"contest": {"id": contest_id}}) "contest": {"id": contest_id}})
@@ -430,9 +429,9 @@ def contest_rank_page(request, contest_id):
rank = r.get(cache_key) rank = r.get(cache_key)
if not rank: if not rank:
rank = ContestRank.objects.filter(contest_id=contest_id).\ rank = ContestRank.objects.filter(contest_id=contest_id). \
select_related("user").\ select_related("user"). \
order_by("-total_ac_number", "total_time").\ order_by("-total_ac_number", "total_time"). \
values("id", "user__id", "user__username", "user__real_name", "contest_id", "submission_info", values("id", "user__id", "user__username", "user__real_name", "contest_id", "submission_info",
"total_submission_number", "total_ac_number", "total_time") "total_submission_number", "total_ac_number", "total_time")
r.set(cache_key, json.dumps([dict(item) for item in rank])) r.set(cache_key, json.dumps([dict(item) for item in rank]))
@@ -459,13 +458,14 @@ def contest_rank_page(request, contest_id):
"contest_problems": contest_problems, "contest_problems": contest_problems,
"paging_info": paging_info, "paging_info": paging_info,
"auto_refresh": request.GET.get("auto_refresh", None) == "true", "auto_refresh": request.GET.get("auto_refresh", None) == "true",
"show_real_name": request.GET.get("show_real_name", None) == "true",}) "show_real_name": request.GET.get("show_real_name", None) == "true", })
class ContestTimeAPIView(APIView): class ContestTimeAPIView(APIView):
""" """
获取比赛开始或者结束的倒计时，返回毫秒数字 获取比赛开始或者结束的倒计时，返回毫秒数字
""" """
def get(self, request): def get(self, request):
contest_id = request.GET.get("contest_id", -1) contest_id = request.GET.get("contest_id", -1)
try: try:
@@ -490,8 +490,8 @@ def contest_problem_my_submissions_list_page(request, contest_id, contest_proble
contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
except ContestProblem.DoesNotExist: except ContestProblem.DoesNotExist:
return error_page(request, u"比赛问题不存在") return error_page(request, u"比赛问题不存在")
submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).\ submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id). \
order_by("-create_time").\ order_by("-create_time"). \
values("id", "result", "create_time", "accepted_answer_time", "language") values("id", "result", "create_time", "accepted_answer_time", "language")
return render(request, "oj/submission/problem_my_submissions_list.html", return render(request, "oj/submission/problem_my_submissions_list.html",
{"submissions": submissions, "problem": contest_problem}) {"submissions": submissions, "problem": contest_problem})
@@ -507,7 +507,7 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
except Contest.DoesNotExist: except Contest.DoesNotExist:
return error_page(request, u"比赛不存在") return error_page(request, u"比赛不存在")
submissions = Submission.objects.filter(contest_id=contest_id).\ submissions = Submission.objects.filter(contest_id=contest_id). \
values("id", "contest_id", "problem_id", "result", "create_time", values("id", "contest_id", "problem_id", "result", "create_time",
"accepted_answer_time", "language", "user_id").order_by("-create_time") "accepted_answer_time", "language", "user_id").order_by("-create_time")
@@ -568,4 +568,4 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
return render(request, "oj/contest/submissions_list.html", return render(request, "oj/contest/submissions_list.html",
{"submissions": current_page, "page": int(page), {"submissions": current_page, "page": int(page),
"previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20, "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
"contest": contest, "filter": filter, "user_id": user_id, "problem_id": problem_id}) "contest": contest, "filter": filter, "user_id": user_id, "problem_id": problem_id})