diff --git a/cookbook/templates/shopping_list.html b/cookbook/templates/shopping_list.html index 4dcd36d82a..c52414d09f 100644 --- a/cookbook/templates/shopping_list.html +++ b/cookbook/templates/shopping_list.html @@ -542,6 +542,7 @@

{% trans 'Shopping List' %}

this.loadShoppingList() {% if recipes %} + this.loading = true this.edit_mode = true let loadingRecipes = [] @@ -605,6 +606,7 @@

{% trans 'Shopping List' %}

}) }, loadInitialRecipe: function (recipe, servings) { + servings = 1 //TODO temporary until i can actually fix the servings for this #453 return this.$http.get('{% url 'api:recipe-detail' 123456 %}'.replace('123456', recipe)).then((response) => { this.addRecipeToList(response.data, servings) }).catch((err) => { diff --git a/cookbook/views/views.py b/cookbook/views/views.py index bb122d70d5..9402efb07d 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -252,7 +252,7 @@ def shopping_list(request, pk=None): if re.match(r'^([0-9])+,([0-9])+[.]*([0-9])*$', r): rid, multiplier = r.split(',') if recipe := Recipe.objects.filter(pk=int(rid)).first(): - recipes.append({'recipe': recipe.id, 'multiplier': multiplier}) + recipes.append({'recipe': recipe.id, 'servings': multiplier}) edit = True if 'edit' in request.GET and request.GET['edit'] == 'true' else False