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

Merge branch 'develop' into patch2

Browse Source
This commit is contained in:
vabene1111
2021-09-15 17:28:01 +02:00
committed by GitHub
parent 0680cefbe1 60aa384f3c
commit 1fa9c806a6
13 changed files with 80 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cookbook/static/vue/js/model_list_view.js
View File

File diff suppressed because one or more lines are too long

3
cookbook/static/vue/js/recipe_search_view.js
View File

File diff suppressed because one or more lines are too long

23
cookbook/views/data.py
View File

@@ -21,7 +21,7 @@ from cookbook.helper.image_processing import handle_image
from cookbook.helper.permission_helper import group_required, has_group_permission
from cookbook.helper.recipe_url_import import parse_cooktime
from cookbook.models import (Comment, Food, Ingredient, Keyword, Recipe,
RecipeImport, Step, Sync, Unit, UserPreference)
RecipeImport, Step, Sync, Unit, UserPreference, Automation)
from cookbook.tables import SyncTable
@@ -153,17 +153,20 @@ def import_url(request):
recipe.keywords.add(k)
for ing in data['recipeIngredient']:
ingredient = Ingredient(space=request.space,)
ingredient = Ingredient(space=request.space, )
if ing['ingredient']['text'] != '':
ingredient.food, f_created = Food.objects.get_or_create(
name=ing['ingredient']['text'].strip(), space=request.space
)
if food_text := ing['ingredient']['text'].strip() != '':
if automation := Automation.objects.filter(space=request.space, type=Automation.FOOD_ALIAS, param_1=food_text).first():
ingredient.food.id = automation.param_2
else:
ingredient.food, f_created = Food.objects.get_or_create(name=food_text, space=request.space)
if ing['unit'] and ing['unit']['text'] != '':
ingredient.unit, u_created = Unit.objects.get_or_create(
name=ing['unit']['text'].strip(), space=request.space
)
if ing['unit']:
if unit_text := ing['unit']['text'] != '':
if automation := Automation.objects.filter(space=request.space, type=Automation.UNIT_ALIAS, param_1=unit_text).first():
ingredient.unit.id = automation.param_2
else:
ingredient.unit, u_created = Unit.objects.get_or_create(name=unit_text, space=request.space)
# TODO properly handle no_amount recipes
if isinstance(ing['amount'], str):