From 93b2e2d7e4461967faea66b9f6608916cfb4a51f Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 28 Dec 2020 14:18:51 +0100 Subject: [PATCH] fixed small issues --- cookbook/migrations/0091_recipe_servings.py | 18 ------------------ cookbook/views/views.py | 6 ++++-- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 cookbook/migrations/0091_recipe_servings.py diff --git a/cookbook/migrations/0091_recipe_servings.py b/cookbook/migrations/0091_recipe_servings.py deleted file mode 100644 index 0b023bf7e..000000000 --- a/cookbook/migrations/0091_recipe_servings.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.7 on 2020-08-30 13:32 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cookbook', '0090_auto_20201214_1359'), - ] - - operations = [ - migrations.AddField( - model_name='recipe', - name='servings', - field=models.IntegerField(default=1), - ), - ] diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 51c026806..0bfb94427 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -111,8 +111,10 @@ def recipe_view(request, pk, share=None): comment_form = CommentForm() bookmark_form = RecipeBookEntryForm() - user_servings = CookLog.objects.filter(recipe=recipe, created_by=request.user, - servings__gt=0).all().aggregate(Avg('servings'))['servings__avg'] + user_servings = None + if request.user.is_authenticated: + user_servings = CookLog.objects.filter(recipe=recipe, created_by=request.user, + servings__gt=0).all().aggregate(Avg('servings'))['servings__avg'] if request.user.is_authenticated: if not ViewLog.objects.filter(recipe=recipe).filter(created_by=request.user).filter(