Merge branch 'develop' of github.com:ndbeals/tandoor_recipes into develop

This commit is contained in:
Nathan Beals
2022-04-23 00:11:08 -04:00
31 changed files with 1312 additions and 698 deletions

View File

@@ -594,6 +594,7 @@ class IngredientViewSet(viewsets.ModelViewSet):
queryset = Ingredient.objects
serializer_class = IngredientSerializer
permission_classes = [CustomIsUser]
pagination_class = DefaultPagination
def get_serializer_class(self):
if self.request and self.request.query_params.get('simple', False):
@@ -1193,6 +1194,11 @@ def recipe_from_source(request):
'error': True,
'msg': _('Connection Refused.')
}, status=400)
except requests.exceptions.MissingSchema:
return JsonResponse({
'error': True,
'msg': _('Bad URL Schema.')
}, status=400)
recipe_json, recipe_tree, recipe_html, recipe_images = get_recipe_from_source(data, url, request)
if len(recipe_tree) == 0 and len(recipe_json) == 0:
return JsonResponse({