cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed meal plan notes and recipe links

Browse Source
This commit is contained in:
vabene1111
2021-04-29 17:15:06 +02:00
parent cc34496c00
commit 239ba5f861
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/serializer.py
View File

@ -349,7 +349,7 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer):
class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer): class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
recipe = RecipeOverviewSerializer() recipe = RecipeOverviewSerializer(required=False)
recipe_name = serializers.ReadOnlyField(source='recipe.name') recipe_name = serializers.ReadOnlyField(source='recipe.name')
meal_type_name = serializers.ReadOnlyField(source='meal_type.name') meal_type_name = serializers.ReadOnlyField(source='meal_type.name')
note_markdown = serializers.SerializerMethodField('get_note_markdown') note_markdown = serializers.SerializerMethodField('get_note_markdown')

2
cookbook/templates/meal_plan.html
View File

@ -670,7 +670,7 @@
} }
}, },
planDetailRecipeUrl: function () { 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 () { planDetailEditUrl: function () {
return "{% url 'edit_meal_plan' 12345 %}".replace(/12345/, this.plan_detail.id); return "{% url 'edit_meal_plan' 12345 %}".replace(/12345/, this.plan_detail.id);