Skip to content

Commit

Permalink
Add wagtail patch for partial search
Browse files Browse the repository at this point in the history
Add a patch for wagtail.

This patch can be used to update wagtail after is has been installed
into a virtual environment.
  • Loading branch information
donald committed Nov 15, 2019
1 parent aa7f886 commit a0d4f1a
Showing 1 changed file with 75 additions and 0 deletions.
75 changes: 75 additions & 0 deletions patches/documents-and-images-support-partial-matches.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
From 1a1251cfb19cc49d94dfd71a8b84171916060c9b Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Fri, 15 Nov 2019 17:22:38 +0100
Subject: [PATCH] documents/images: Support partial match on search

The postgres_search backend currently doesn't support partial searches
in its search() method. The index and the autocomplete method, however
do.

Enable partial matches for wagtails backend view and chooser by using
.autocomplete instead of .search.

This is a workaround and should be replaced by a cleaner approach.
---
lib/python3.7/site-packages/wagtail/documents/views/chooser.py | 2 +-
.../site-packages/wagtail/documents/views/documents.py | 2 +-
lib/python3.7/site-packages/wagtail/images/views/chooser.py | 2 +-
lib/python3.7/site-packages/wagtail/images/views/images.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/python3.7/site-packages/wagtail/documents/views/chooser.py b/lib/python3.7/site-packages/wagtail/documents/views/chooser.py
index f5d6331..a13378b 100644
--- a/lib/python3.7/site-packages/wagtail/documents/views/chooser.py
+++ b/lib/python3.7/site-packages/wagtail/documents/views/chooser.py
@@ -68,7 +68,7 @@ def chooser(request):
if searchform.is_valid():
q = searchform.cleaned_data['q']

- documents = documents.search(q)
+ documents = documents.autocomplete(q)
is_searching = True
else:
documents = documents.order_by('-created_at')
diff --git a/lib/python3.7/site-packages/wagtail/documents/views/documents.py b/lib/python3.7/site-packages/wagtail/documents/views/documents.py
index 36966e9..41ae754 100644
--- a/lib/python3.7/site-packages/wagtail/documents/views/documents.py
+++ b/lib/python3.7/site-packages/wagtail/documents/views/documents.py
@@ -51,7 +51,7 @@ def index(request):
form = SearchForm(request.GET, placeholder=_("Search documents"))
if form.is_valid():
query_string = form.cleaned_data['q']
- documents = documents.search(query_string)
+ documents = documents.autocomplete(query_string)
else:
form = SearchForm(placeholder=_("Search documents"))

diff --git a/lib/python3.7/site-packages/wagtail/images/views/chooser.py b/lib/python3.7/site-packages/wagtail/images/views/chooser.py
index cba82d8..c565385 100644
--- a/lib/python3.7/site-packages/wagtail/images/views/chooser.py
+++ b/lib/python3.7/site-packages/wagtail/images/views/chooser.py
@@ -94,7 +94,7 @@ def chooser(request):
if searchform.is_valid():
q = searchform.cleaned_data['q']

- images = images.search(q)
+ images = images.autocomplete(q)
is_searching = True
else:
is_searching = False
diff --git a/lib/python3.7/site-packages/wagtail/images/views/images.py b/lib/python3.7/site-packages/wagtail/images/views/images.py
index a42958b..ed388f9 100644
--- a/lib/python3.7/site-packages/wagtail/images/views/images.py
+++ b/lib/python3.7/site-packages/wagtail/images/views/images.py
@@ -40,7 +40,7 @@ def index(request):
if form.is_valid():
query_string = form.cleaned_data['q']

- images = images.search(query_string)
+ images = images.autocomplete(query_string)
else:
form = SearchForm(placeholder=_("Search images"))

--
2.22.0

0 comments on commit a0d4f1a

Please sign in to comment.