From 239ba5f8614998be05174fafc33422a76bb323c9 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Thu, 29 Apr 2021 17:15:06 +0200 Subject: [PATCH] fixed meal plan notes and recipe links --- cookbook/serializer.py | 2 +- cookbook/templates/meal_plan.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 1da30c67a..a8f72b25d 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -349,7 +349,7 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer): class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer): - recipe = RecipeOverviewSerializer() + recipe = RecipeOverviewSerializer(required=False) 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 38e5c26df..bca6a548d 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -670,7 +670,7 @@ } }, planDetailRecipeUrl: function () { - return "{% url 'view_recipe' 12345 %}".replace(/12345/, this.plan_detail.recipe); + return "{% url 'view_recipe' 12345 %}".replace(/12345/, this.plan_detail.recipe.id); }, planDetailEditUrl: function () { return "{% url 'edit_meal_plan' 12345 %}".replace(/12345/, this.plan_detail.id);