From 64d7f71d865afc8fbc28842eb694b40f750238ce Mon Sep 17 00:00:00 2001 From: smilerz Date: Wed, 21 Apr 2021 13:22:48 -0500 Subject: [PATCH] filter.py --- cookbook/filters.py | 4 ---- ...build_full_text_index.py => 0120_build_full_text_index.py} | 2 +- cookbook/views/views.py | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) rename cookbook/migrations/{0119_build_full_text_index.py => 0120_build_full_text_index.py} (96%) diff --git a/cookbook/filters.py b/cookbook/filters.py index 81eba379f..df6284e18 100644 --- a/cookbook/filters.py +++ b/cookbook/filters.py @@ -47,10 +47,6 @@ with scopes_disabled(): def filter_name(queryset, name, value): if not name == 'name': return queryset - if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', - 'django.db.backends.postgresql']: - queryset = queryset.annotate(similarity=TrigramSimilarity('name', value), ).filter( - Q(similarity__gt=0.1) | Q(name__unaccent__icontains=value)).order_by('-similarity') if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']: return queryset else: diff --git a/cookbook/migrations/0119_build_full_text_index.py b/cookbook/migrations/0120_build_full_text_index.py similarity index 96% rename from cookbook/migrations/0119_build_full_text_index.py rename to cookbook/migrations/0120_build_full_text_index.py index 9847ccf36..23c2c61ff 100644 --- a/cookbook/migrations/0119_build_full_text_index.py +++ b/cookbook/migrations/0120_build_full_text_index.py @@ -19,7 +19,7 @@ def set_default_search_vector(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('cookbook', '0118_auto_20210406_1805'), + ('cookbook', '0119_auto_20210411_2101'), ] operations = [ migrations.AddField( diff --git a/cookbook/views/views.py b/cookbook/views/views.py index a091e2a92..b8a916a9e 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -61,10 +61,6 @@ def search(request): if has_group_permission(request.user, ('guest',)): if request.user.userpreference.search_style == UserPreference.NEW: return search_v2(request) - - f = RecipeFilter(request.GET, - queryset=Recipe.objects.filter(space=request.user.userpreference.space).all().order_by('name'), - space=request.space) if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']: qs = Recipe.objects.search(request.GET.get('name', ''), space=request.space) else: