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

i

contest/views.py

@@ -343,12 +343,12 @@ def contest_list_page(request, page=1):
     # 搜索的情况
     keyword = request.GET.get("keyword", None)
     if keyword:
-        contests = contests.filter(title__contains=keyword)
+        contests = contests.filter(Q(title__contains=keyword) | Q(description__contains=keyword))
 
     # 筛选我能参加的比赛
     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 = contests.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)