commit merge from Patralos/recipes

cookbook/views/api.py

@@ -28,8 +28,8 @@ from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsGuest,
                                                CustomIsOwner, CustomIsShare,
                                                CustomIsShared, CustomIsUser,
                                                group_required)
-from cookbook.helper.recipe_url_import import get_from_html
-from cookbook.helper.recipe_raw_import import get_from_raw
+from cookbook.helper.recipe_url_import import get_from_html, find_recipe_json
+from cookbook.helper.recipe_html_import import get_from_html
 from cookbook.models import (CookLog, Food, Ingredient, Keyword, MealPlan,
                              MealType, Recipe, RecipeBook, ShoppingList,
                              ShoppingListEntry, ShoppingListRecipe, Step,
@@ -608,9 +608,9 @@ def recipe_from_url_old(request):
 
 
 @group_required('user')
-def recipe_from_raw(request):
-    raw_text = request.POST['raw_text']
-    recipe_json, recipe_tree = get_from_raw(raw_text)
+def recipe_from_html(request):
+    html_data = request.POST['html_data']
+    recipe_json, recipe_tree = get_from_html(html_data)
     return JsonResponse({
         'recipe_tree': recipe_tree,
         'recipe_json': recipe_json

cookbook/views/import_export.py

@@ -101,12 +101,3 @@ def export_recipe(request):
 
     return render(request, 'export.html', {'form': form})
 
-
-@group_required('user')
-def import_json(request):
-    if request.method == "POST":
-        return True
-    else:
-        pass
-
-    return render(request, 'import_json.html')

cookbook/views/views.py

@@ -224,10 +224,10 @@ def latest_shopping_list(request):
 
 @group_required('user')
 def shopping_list(request, pk=None):
-    raw_list = request.GET.getlist('r')
+    html_list = request.GET.getlist('r')
 
     recipes = []
-    for r in raw_list:
+    for r in html_list:
         r = r.replace('[', '').replace(']', '')
         if re.match(r'^([0-9])+,([0-9])+[.]*([0-9])*$', r):
             rid, multiplier = r.split(',')