fix that does not really fix anything

see #453/454
This commit is contained in:
vabene1111
2021-02-23 21:43:14 +01:00
parent 4147bc61c7
commit 205f76d128
2 changed files with 3 additions and 1 deletions

View File

@@ -542,6 +542,7 @@
this.loadShoppingList()
{% if recipes %}
this.loading = true
this.edit_mode = true
let loadingRecipes = []
@@ -605,6 +606,7 @@
})
},
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) => {

View File

@@ -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