mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed small issues

Browse Source
This commit is contained in:
vabene1111
2020-12-28 14:18:51 +01:00
parent 8b2833f353
commit 93b2e2d7e4
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cookbook/migrations/0091_recipe_servings.py
View File

@@ -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),
),
]

6
cookbook/views/views.py
View File

@@ -111,8 +111,10 @@ def recipe_view(request, pk, share=None):
comment_form = CommentForm() comment_form = CommentForm()
bookmark_form = RecipeBookEntryForm() bookmark_form = RecipeBookEntryForm()
user_servings = CookLog.objects.filter(recipe=recipe, created_by=request.user, user_servings = None
servings__gt=0).all().aggregate(Avg('servings'))['servings__avg'] 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 request.user.is_authenticated:
if not ViewLog.objects.filter(recipe=recipe).filter(created_by=request.user).filter( if not ViewLog.objects.filter(recipe=recipe).filter(created_by=request.user).filter(