cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added ingredient notes + removed null constraints

Browse Source
This commit is contained in:
vabene1111
2020-03-17 22:47:17 +01:00
parent 1d562452df
commit 0c2b3d2d03
6 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/views/edit.py
View File

@ -86,6 +86,8 @@ def internal_recipe_update(request, pk):
recipe_ingredient = RecipeIngredient()
recipe_ingredient.recipe = recipe_instance
recipe_ingredient.note = i['note']
if Ingredient.objects.filter(name=i['ingredient__name']).exists():
recipe_ingredient.ingredient = Ingredient.objects.get(name=i['ingredient__name'])
else:
@ -118,7 +120,7 @@ def internal_recipe_update(request, pk):
else:
form = InternalRecipeForm(instance=recipe_instance)
ingredients = RecipeIngredient.objects.select_related('unit__name', 'ingredient__name').filter(recipe=recipe_instance).values('ingredient__name', 'unit__name', 'amount')
ingredients = RecipeIngredient.objects.select_related('unit__name', 'ingredient__name').filter(recipe=recipe_instance).values('ingredient__name', 'unit__name', 'amount', 'note')
return render(request, 'forms/edit_internal_recipe.html',
{'form': form, 'ingredients': json.dumps(list(ingredients)),