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/problem/views.py
+++ b/problem/views.py
@@ -222,7 +222,7 @@ def problem_list_page(request, page=1):
    # 搜索的情况
    keyword = request.GET.get("keyword", None)
    if keyword:
-        problems = problems.filter(title__contains=keyword)
+        problems = problems.filter(Q(title__contains=keyword) | Q(description__contains=keyword))

    # 按照标签筛选
    tag_text = request.GET.get("tag", None)