diff --git a/cookbook/helper/recipe_search.py b/cookbook/helper/recipe_search.py index d651a6ee2..c15c55e41 100644 --- a/cookbook/helper/recipe_search.py +++ b/cookbook/helper/recipe_search.py @@ -277,6 +277,8 @@ class RecipeSearch(): ) def _recently_viewed(self, num_recent=None): + # self._queryset = self._queryset.annotate(recent=Value(0)) + # return if not num_recent: if self._sort_includes('lastviewed'): self._queryset = self._queryset.annotate(lastviewed=Coalesce( diff --git a/cookbook/migrations/0184_alter_userpreference_image.py b/cookbook/migrations/0184_alter_userpreference_image.py new file mode 100644 index 000000000..efbfd98bb --- /dev/null +++ b/cookbook/migrations/0184_alter_userpreference_image.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.7 on 2022-09-12 10:29 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('cookbook', '0183_alter_space_image'), + ] + + operations = [ + migrations.AlterField( + model_name='userpreference', + name='image', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='user_image', to='cookbook.userfile'), + ), + ] diff --git a/cookbook/models.py b/cookbook/models.py index fbe0c71c4..2d0f0c545 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -366,7 +366,7 @@ class UserPreference(models.Model, PermissionModelMixin): ) user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True) - image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, related_name='user_image') + image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True,blank=True, related_name='user_image') theme = models.CharField(choices=THEMES, max_length=128, default=TANDOOR) nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY) default_unit = models.CharField(max_length=32, default='g') diff --git a/recipes/settings.py b/recipes/settings.py index 56bb35022..265e774e7 100644 --- a/recipes/settings.py +++ b/recipes/settings.py @@ -115,6 +115,7 @@ INSTALLED_APPS = [ 'allauth.socialaccount', 'cookbook.apps.CookbookConfig', 'treebeard', + 'debug_toolbar' ] SOCIAL_PROVIDERS = os.getenv('SOCIAL_PROVIDERS').split(',') if os.getenv('SOCIAL_PROVIDERS') else [] @@ -156,6 +157,7 @@ MIDDLEWARE = [ 'django.middleware.locale.LocaleMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'cookbook.helper.scope_middleware.ScopeMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', ] SORT_TREE_BY_NAME = bool(int(os.getenv('SORT_TREE_BY_NAME', False))) @@ -319,17 +321,17 @@ else: } # Local testing DB -# DATABASES = { -# 'default': { -# 'ENGINE': 'django.db.backends.postgresql', -# 'HOST': 'localhost', -# 'PORT': 5432, -# 'USER': 'postgres', -# 'PASSWORD': 'postgres', # set to local pw -# 'NAME': 'postgres', -# 'CONN_MAX_AGE': 600, -# } -# } +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'HOST': 'localhost', + 'PORT': 5432, + 'USER': 'postgres', + 'PASSWORD': 'postgres', # set to local pw + 'NAME': 'tandoor_app', + 'CONN_MAX_AGE': 600, + } +} # SQLite testing DB # DATABASES = { diff --git a/recipes/urls.py b/recipes/urls.py index 16c0187b5..ffe02e900 100644 --- a/recipes/urls.py +++ b/recipes/urls.py @@ -33,6 +33,9 @@ urlpatterns = [ ), ] +if settings.DEBUG: + urlpatterns += path('__debug__/', include('debug_toolbar.urls')), + if settings.ENABLE_METRICS: urlpatterns += re_path('', include('django_prometheus.urls')), diff --git a/requirements.txt b/requirements.txt index e7046a8e7..c194bcb47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ django-tables2==2.4.1 djangorestframework==3.13.1 drf-writable-nested==0.7.0 django-oauth-toolkit==2.1.0 +django-debug-toolbar==3.6.0 bleach==5.0.1 bleach-allowlist==1.0.3 gunicorn==20.1.0