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

Fix after rebase

Browse Source
This commit is contained in:
smilerz
2021-05-01 16:30:33 -05:00
parent d7afbc5745
commit 59c33798b8
8 changed files with 278 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/views/api.py
View File

@@ -34,9 +34,13 @@ from cookbook.helper.ingredient_parser import parse
from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsGuest,
CustomIsOwner, CustomIsShare,
CustomIsShared, CustomIsUser,
group_required, share_link_valid)
from cookbook.helper.recipe_html_import import get_recipe_from_source
from cookbook.helper.recipe_url_import import get_from_scraper
from cookbook.helper.recipe_search import search_recipes
from cookbook.helper.recipe_url_import import get_from_html, get_from_scraper, find_recipe_json
from cookbook.models import (CookLog, Food, Ingredient, Keyword, MealPlan,
MealType, Recipe, RecipeBook, ShoppingList,
ShoppingListEntry, ShoppingListRecipe, Step,

12
cookbook/views/data.py
View File

@@ -132,11 +132,13 @@ def import_url(request):
recipe.steps.add(step)
for kw in data['keywords']:
if k := Keyword.objects.filter(name=kw['text'], space=request.space).first():
recipe.keywords.add(k)
elif data['all_keywords']:
k = Keyword.objects.create(name=kw['text'], space=request.space)
recipe.keywords.add(k)
# if k := Keyword.objects.filter(name=kw['text'], space=request.space).first():
# recipe.keywords.add(k)
# elif data['all_keywords']:
# k = Keyword.objects.create(name=kw['text'], space=request.space)
# recipe.keywords.add(k)
k, created = Keyword.objects.get_or_create(name=kw['text'].strip(), space=request.space)
recipe.keywords.add(k)
for ing in data['recipeIngredient']:
ingredient = Ingredient()