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

i
2015-09-05 18:55:10 +08:00
parent c163103542 b1c5cf72ec
commit e871e51f0b
60 changed files with 1344 additions and 602 deletions
--- a/problem/views.py
+++ b/problem/views.py
@@ -226,7 +226,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)