Merge pull request #952 from uktrade/hotfix/document-link-in-rich-text

HOTFIX: reinstate document-link as rich-text field option
uktrade · Feb 17, 2021 · ff3ed07 · ff3ed07
2 parents 8c6aec0 + 13d3c5c
commit ff3ed07
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## Pre-release
+### Fixed bugs
+- NO TICKET - add document-link back in as rich-text option
 
 ### Implemented enhancements
 
@@ -12,8 +14,6 @@
 - GP2-1424 - Cost and pricing page - local taxes section
 - GP2-1423 - Cost and pricing page - content change
 - GP2-1411 - Refactor ArticlePage to use a StreamField with new PullQuoteBlock
-### Fixed bugs
-
 
 ## [1.2.0](https://github.com/uktrade/great-cms/releases/tag/1.2.0)
 

diff --git a/core/constants.py b/core/constants.py
@@ -20,6 +20,7 @@
     'ul',
     'hr',
     'link',
+    'document-link',  #  to allow links to Wagtail-held documents
     # 'blockquote', # NOT used - use a PullQuoteBlock in a StreamField, or similar
 )
 

diff --git a/domestic/migrations/0016_switch_article_body_text_to_streamfield.py b/domestic/migrations/0016_switch_article_body_text_to_streamfield.py
@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
                     (
                         'text',
                         wagtail.core.blocks.RichTextBlock(
-                            features=('h2', 'h3', 'h4', 'bold', 'italic', 'ol', 'ul', 'hr', 'link')
+                            features=('h2', 'h3', 'h4', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link')
                         ),
                     ),
                     (
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
         'ul',
         'hr',
         'link',
+        'document-link',  #  to allow links to Wagtail-held documents
         # 'blockquote', # NOT used - use a PullQuoteBlock in a StreamField, or similar
     )
@@ Expand Down @@