From d67bb9de255a730940f96942c034028c84c18f06 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 19 May 2021 13:12:12 +0200 Subject: [PATCH] fixed mealplan update non recipe entries --- cookbook/serializer.py | 2 +- cookbook/templates/meal_plan.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index c67bf5f2..5016bef8 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -355,7 +355,7 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer): class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer): - recipe = RecipeOverviewSerializer(required=False) + recipe = RecipeOverviewSerializer(required=False, allow_null=True) recipe_name = serializers.ReadOnlyField(source='recipe.name') meal_type_name = serializers.ReadOnlyField(source='meal_type.name') note_markdown = serializers.SerializerMethodField('get_note_markdown') diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index bca6a548..ee574f1e 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -567,10 +567,11 @@ console.log("dragChanged create error", err); }) } else { + console.log(plan_entry) this.$http.put(`{% url 'api:mealplan-list' %}${plan_entry.id}/`, plan_entry).then((response) => { }).catch((err) => { console.log("dragChanged update error", err); - this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger') + this.makeToast(gettext('Error'), gettext('There was an error updating a resource!') + err.bodyText, 'danger') }) } }