From dc4819fea2de63c208187dc624214da470afe180 Mon Sep 17 00:00:00 2001 From: yangjian Date: Tue, 20 Jul 2021 18:25:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E9=9B=86=E5=86=85?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=90=9C=E7=B4=A2=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ app_doc/views.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index baa254d..9501c38 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ - [优化]个人中心我协作的文集页面及功能； - [优化]后台邮件服务器配置逻辑和页面展示； - [优化]文档发布和修改的异常判断和处理； +- [优化]首页移动端控制栏样式； +- [优化]文集内搜索文档； ### v0.6.8 2021-06-27 diff --git a/app_doc/views.py b/app_doc/views.py index c48e662..5369340 100644 --- a/app_doc/views.py +++ b/app_doc/views.py @@ -400,7 +400,7 @@ def project_index(request,pro_id): # status=1 # ).values('id','name','top_doc').order_by('sort') if kw != '': - search_result = Doc.objects.filter(top_doc=int(pro_id),pre_content__icontains=kw) + search_result = Doc.objects.filter(Q(pre_content__icontains=kw) | Q(name__icontains=kw),top_doc=int(pro_id)) remove_markdown_tag(search_result) return render(request,'app_doc/project_doc_search.html',locals()) return render(request, 'app_doc/project.html', locals())