Merge pull request #777 from uktrade/release

31 January Prod release
uktrade · Jan 31, 2020 · a11220f · a11220f
2 parents 6630c49 + a980c49
commit a11220f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Pre-release
 
+### Implemented enhancements
+
+- XOT-1285 madb content markdown field
+
 ## [2020.01.29](https://github.com/uktrade/directory-cms/releases/tag/2020.01.29)
 [Full Changelog](https://github.com/uktrade/directory-cms/compare/2020.01.20...2020.01.29)
 

diff --git a/export_readiness/models.py b/export_readiness/models.py
@@ -1402,7 +1402,7 @@ class HomePage(
         verbose_name='Image'
     )
     madb_image_alt = models.TextField(null=True, blank=True, verbose_name='Image alt text')
-    madb_content = models.TextField(null=True, blank=True, verbose_name='Content')
+    madb_content = MarkdownField(null=True, blank=True, verbose_name='Content')
     madb_cta_text = models.CharField(null=True, blank=True, max_length=255, verbose_name='CTA text')
     madb_cta_url = models.CharField(null=True, blank=True, max_length=255, verbose_name='CTA URL')
 

diff --git a/export_readiness/serializers.py b/export_readiness/serializers.py
@@ -482,7 +482,7 @@ class HomePageSerializer(BasePageSerializer):
     madb_title = serializers.CharField(required=False)
     madb_image = wagtail_fields.ImageRenditionField('original', required=False)
     madb_image_alt = serializers.CharField(required=False)
-    madb_content = serializers.CharField(required=False)
+    madb_content = core_fields.MarkdownToHTMLField(required=False)
     madb_cta_text = serializers.CharField(required=False)
     madb_cta_url = serializers.CharField(required=False)