修复代码冲突

2015-08-22 22:16:08 +08:00
parent f250dec201
commit 7b3c14343b
3 changed files with 75 additions and 79 deletions
--- a/contest/views.py
+++ b/contest/views.py
@@ -293,7 +293,8 @@ def contest_list_page(request, page=1):
    # 筛选我能参加的比赛
    join = request.GET.get("join", None)
    if join:
-        contests = Contest.objects.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all()))
+        contests = Contest.objects.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\
+            filter(end_time__gt=datetime.datetime.now(), start_time__lt=datetime.datetime.now())

    paginator = Paginator(contests, 20)
    try: