diff --git a/cookbook/helper/template_helper.py b/cookbook/helper/template_helper.py index e88e75480..8190f3a4d 100644 --- a/cookbook/helper/template_helper.py +++ b/cookbook/helper/template_helper.py @@ -16,13 +16,13 @@ class IngredientObject(object): if ingredient.no_amount: self.amount = "" else: - self.amount = f"" + self.amount = f"" if ingredient.unit: - self.unit = ingredient.unit + self.unit = bleach.clean(str(ingredient.unit)) else: self.unit = "" - self.food = ingredient.food - self.note = ingredient.note + self.food = bleach.clean(str(ingredient.food)) + self.note = bleach.clean(str(ingredient.note)) def __str__(self): ingredient = self.amount diff --git a/cookbook/serializer.py b/cookbook/serializer.py index d2b6bf13f..69738a665 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -159,6 +159,10 @@ class IngredientSerializer(WritableNestedModelSerializer): class StepSerializer(WritableNestedModelSerializer): ingredients = IngredientSerializer(many=True) ingredients_markdown = serializers.SerializerMethodField('get_ingredients_markdown') + ingredients_vue = serializers.SerializerMethodField('get_ingredients_vue') + + def get_ingredients_vue(self, obj): + return obj.get_instruction_render() def get_ingredients_markdown(self, obj): return obj.get_instruction_render() @@ -167,7 +171,7 @@ class StepSerializer(WritableNestedModelSerializer): model = Step fields = ( 'id', 'name', 'type', 'instruction', 'ingredients', 'ingredients_markdown', - 'time', 'order', 'show_as_header' + 'ingredients_vue', 'time', 'order', 'show_as_header' )