diff --git a/.idea/recipes.iml b/.idea/recipes.iml
index e1dd70647..06582e143 100644
--- a/.idea/recipes.iml
+++ b/.idea/recipes.iml
@@ -6,7 +6,7 @@
-
+
diff --git a/cookbook/filters.py b/cookbook/filters.py
index 8a822abc7..b679a79fb 100644
--- a/cookbook/filters.py
+++ b/cookbook/filters.py
@@ -49,8 +49,10 @@ 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']:
+ queryset = queryset.annotate(similarity=TrigramSimilarity('name', value), ).filter(
+ Q(similarity__gt=0.1) | Q(name__unaccent__icontains=value)).order_by('-similarity')
else:
queryset = queryset.filter(name__icontains=value)
return queryset
diff --git a/cookbook/migrations/0119_auto_20210411_2101.py b/cookbook/migrations/0119_auto_20210411_2101.py
new file mode 100644
index 000000000..942adc6c1
--- /dev/null
+++ b/cookbook/migrations/0119_auto_20210411_2101.py
@@ -0,0 +1,15 @@
+# Generated by Django 3.2 on 2021-04-11 19:01
+from django.contrib.postgres.operations import UnaccentExtension, TrigramExtension
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('cookbook', '0118_auto_20210406_1805'),
+ ]
+
+ operations = [
+ TrigramExtension(),
+ UnaccentExtension(),
+ ]
diff --git a/recipes/settings.py b/recipes/settings.py
index e7310a91b..eb46736ea 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -29,7 +29,6 @@ DEMO = bool(int(os.getenv('DEMO', False)))
SOCIAL_DEFAULT_ACCESS = bool(int(os.getenv('SOCIAL_DEFAULT_ACCESS', False)))
SOCIAL_DEFAULT_GROUP = os.getenv('SOCIAL_DEFAULT_GROUP', 'guest')
-
INTERNAL_IPS = os.getenv('INTERNAL_IPS').split(',') if os.getenv('INTERNAL_IPS') else ['127.0.0.1']
# allow djangos wsgi server to server mediafiles
@@ -75,6 +74,7 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.sites',
'django.contrib.staticfiles',
+ 'django.contrib.postgres',
'django_tables2',
'django_filters',
'crispy_forms',
@@ -93,7 +93,8 @@ INSTALLED_APPS = [
SOCIAL_PROVIDERS = os.getenv('SOCIAL_PROVIDERS').split(',') if os.getenv('SOCIAL_PROVIDERS') else []
INSTALLED_APPS = INSTALLED_APPS + SOCIAL_PROVIDERS
-SOCIALACCOUNT_PROVIDERS = ast.literal_eval(os.getenv('SOCIALACCOUNT_PROVIDERS') if os.getenv('SOCIALACCOUNT_PROVIDERS') else '{}')
+SOCIALACCOUNT_PROVIDERS = ast.literal_eval(
+ os.getenv('SOCIALACCOUNT_PROVIDERS') if os.getenv('SOCIALACCOUNT_PROVIDERS') else '{}')
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',