Revert "Try out postgres fulltext search."
This reverts commit c47350f449
.
This commit is contained in:
parent
c47350f449
commit
8c5d017ed1
@ -23,7 +23,6 @@ from django.db.models import Prefetch
|
|||||||
from django.db.models.functions import Lower
|
from django.db.models.functions import Lower
|
||||||
from django.forms import formset_factory
|
from django.forms import formset_factory
|
||||||
import uuid
|
import uuid
|
||||||
from django.contrib.postgres.search import SearchVector, SearchQuery, SearchRank, TrigramSimilarity
|
|
||||||
|
|
||||||
ParameterSearchFormSet = formset_factory(ComponentParameterSearchForm, extra=0)
|
ParameterSearchFormSet = formset_factory(ComponentParameterSearchForm, extra=0)
|
||||||
|
|
||||||
@ -300,18 +299,12 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
|
|||||||
qs = qs.filter(s_filter)
|
qs = qs.filter(s_filter)
|
||||||
return qs
|
return qs
|
||||||
|
|
||||||
def search_packages_adv(self, search):
|
|
||||||
if not search:
|
|
||||||
return Package.objects.all()
|
|
||||||
|
|
||||||
return Package.objects.annotate(similarity=TrigramSimilarity('name', search)).order_by('-similarity')
|
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
context = super().get_context_data(**kwargs)
|
context = super().get_context_data(**kwargs)
|
||||||
page_num = self.request.GET.get('page', default=1)
|
page_num = self.request.GET.get('page', default=1)
|
||||||
search_string = self.request.GET.get('search', default=None)
|
search_string = self.request.GET.get('search', default=None)
|
||||||
|
|
||||||
package_queryset = self.search_packages_adv(search_string)
|
package_queryset = self.search_packages(search_string)
|
||||||
|
|
||||||
paginator = Paginator(package_queryset, self.default_page_size)
|
paginator = Paginator(package_queryset, self.default_page_size)
|
||||||
|
|
||||||
|
@ -47,7 +47,6 @@ INSTALLED_APPS = [
|
|||||||
'crispy_forms',
|
'crispy_forms',
|
||||||
'crispy_bootstrap5',
|
'crispy_bootstrap5',
|
||||||
'django.forms',
|
'django.forms',
|
||||||
'django.contrib.postgres'
|
|
||||||
]
|
]
|
||||||
|
|
||||||
FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
|
FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
|
||||||
|
@ -68,7 +68,6 @@ INSTALLED_APPS = [
|
|||||||
'crispy_forms',
|
'crispy_forms',
|
||||||
'crispy_bootstrap5',
|
'crispy_bootstrap5',
|
||||||
'django.forms',
|
'django.forms',
|
||||||
'django.contrib.postgres'
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user