added back markdown support to meal plannin notes

cookbook/serializer.py

@@ -2,6 +2,7 @@ from django.contrib.auth.models import User
 from rest_framework import serializers
 
 from cookbook.models import MealPlan, MealType, Recipe, ViewLog
+from cookbook.templatetags.custom_tags import markdown
 
 
 class UserNameSerializer(serializers.ModelSerializer):
@@ -13,10 +14,14 @@ class UserNameSerializer(serializers.ModelSerializer):
 class MealPlanSerializer(serializers.ModelSerializer):
     recipe_name = serializers.ReadOnlyField(source='recipe.name')
     meal_type_name = serializers.ReadOnlyField(source='meal_type.name')
+    note_markdown = serializers.SerializerMethodField('get_note_markdown')
+
+    def get_note_markdown(self, obj):
+        return markdown(obj.note)
 
     class Meta:
         model = MealPlan
-        fields = ('id', 'title', 'recipe', 'note', 'date', 'meal_type', 'created_by', 'shared', 'recipe_name', 'meal_type_name')
+        fields = ('id', 'title', 'recipe', 'note', 'note_markdown', 'date', 'meal_type', 'created_by', 'shared', 'recipe_name', 'meal_type_name')
 
 
 class MealTypeSerializer(serializers.ModelSerializer):

cookbook/templates/meal_plan.html

@@ -211,7 +211,7 @@
 
                         <template v-if="plan_detail.note !== ''">
                             <small class="text-muted">{% trans 'Note' %}</small><br/>
-                            [[ plan_detail.note ]]
+                            <span v-html="plan_detail.note_markdown"></span>
                             <br/>
                         </template>
 
@@ -445,6 +445,18 @@
                         console.log("getRecipes error: ", err);
                     })
                 },
+                getMdNote: function () {
+                    let url = "{% url 'api:recipe-list' %}?limit=5"
+                    if (this.recipe_query !== '') {
+                        url += '&query=' + this.recipe_query;
+                    }
+
+                    this.$http.get(url).then((response) => {
+                        this.recipes = response.data;
+                    }).catch((err) => {
+                        console.log("getRecipes error: ", err);
+                    })
+                },
                 updateUserNames: function () {
                     return this.$http.get("{% url 'api:username-list' %}?filter_list=[" + this.user_id_update + ']').then((response) => {
                         for (let u of response.data) {