diff --git a/shimatta_kenkyusho/parts/views.py b/shimatta_kenkyusho/parts/views.py index 5fa8ce7..3da80e8 100644 --- a/shimatta_kenkyusho/parts/views.py +++ b/shimatta_kenkyusho/parts/views.py @@ -23,7 +23,6 @@ from django.db.models import Prefetch from django.db.models.functions import Lower from django.forms import formset_factory import uuid -from django.contrib.postgres.search import SearchVector, SearchQuery, SearchRank, TrigramSimilarity ParameterSearchFormSet = formset_factory(ComponentParameterSearchForm, extra=0) @@ -300,18 +299,12 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): qs = qs.filter(s_filter) 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): context = super().get_context_data(**kwargs) page_num = self.request.GET.get('page', default=1) 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) diff --git a/shimatta_kenkyusho/shimatta_kenkyusho/settings.py b/shimatta_kenkyusho/shimatta_kenkyusho/settings.py index 937633b..8966031 100644 --- a/shimatta_kenkyusho/shimatta_kenkyusho/settings.py +++ b/shimatta_kenkyusho/shimatta_kenkyusho/settings.py @@ -47,7 +47,6 @@ INSTALLED_APPS = [ 'crispy_forms', 'crispy_bootstrap5', 'django.forms', - 'django.contrib.postgres' ] FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' diff --git a/shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py b/shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py index 863c3a0..43c9681 100644 --- a/shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py +++ b/shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py @@ -68,7 +68,6 @@ INSTALLED_APPS = [ 'crispy_forms', 'crispy_bootstrap5', 'django.forms', - 'django.contrib.postgres' ]