search contains
This commit is contained in:
parent
cbe2cce61b
commit
8538821c24
|
@ -6,6 +6,7 @@ from django.http import Http404, JsonResponse
|
||||||
from django.contrib.admin.models import LogEntry
|
from django.contrib.admin.models import LogEntry
|
||||||
from django_select2.views import AutoResponseView
|
from django_select2.views import AutoResponseView
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
|
from django.db.models import Q
|
||||||
|
|
||||||
from storage.models import Item, Label
|
from storage.models import Item, Label
|
||||||
|
|
||||||
|
@ -41,15 +42,13 @@ def apply_smart_search(query, objects):
|
||||||
|
|
||||||
if not general_term:
|
if not general_term:
|
||||||
return objects
|
return objects
|
||||||
objects = objects.annotate(
|
|
||||||
search=SearchVector('name', 'description', 'props', config='simple'),
|
|
||||||
)
|
|
||||||
general_term = ' '.join(general_term)
|
general_term = ' '.join(general_term)
|
||||||
|
|
||||||
objects = objects.annotate(
|
objects = objects.annotate(
|
||||||
|
search=SearchVector('name', 'description', 'props', config='simple'),
|
||||||
similarity=TrigramSimilarity('name', general_term)
|
similarity=TrigramSimilarity('name', general_term)
|
||||||
).filter(
|
).filter(
|
||||||
similarity__gte=0.15
|
Q(similarity__gte=0.15) | Q(search__contains=general_term)
|
||||||
).order_by('-similarity')
|
).order_by('-similarity')
|
||||||
return objects
|
return objects
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue