Merge branch 'dev' into hohoTT-dev

Conflicts: template/src/oj/submission/my_submissions_list.html
2015-08-31 14:36:28 +08:00
parent 2252107a80 55fac52c33
commit 93974f03b7
15 changed files with 300 additions and 79 deletions
--- a/contest/views.py
+++ b/contest/views.py
@@ -337,7 +337,7 @@ 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)