Merge pull request #622 from uktrade/release

Production release 27th August

CHANGELOG.md

@@ -2,19 +2,31 @@
 
 ## Pre-release
 
+### Implemented enhancements
+- CMS-1832 - Update django
+- CMS-1753 - Remove slug links from markdown fields
+- CI-431 - Added `AboutUkRegionListingPage` and `AboutUkRegionPage` which will replace `CapitalInvestRegionPage`
+
+### Fixed Bugs
+- CMS-1830 - Move title field into translated admin panels to fix bug with untranslated tree_based_breadcrumbs
+
+
+## [2019.08.15](https://github.com/uktrade/directory-cms/releases/tag/2019.08.15)
+[Full Changelog](https://github.com/uktrade/directory-cms/compare/2019.08.08...2019.08.15)
+
 ### Implemented enhancements
 - No ticket - Make teaser field optional in international articles
 - No ticket - Add featured industries to Invest home page
 - CI-321 - About UK landing page
 - CI-276 - Added `CapitalInvestContactFormPage` and `CapitalInvestContactFormSuccessPage`
-- CI-429 - Tree based breadcrumbs can now use `breadcrumbs_label` if available 
+- CI-429 - Tree based breadcrumbs can now use `breadcrumbs_label` if available
 
 ### Fixed Bugs
 - CI-426 - Added pdf document upload to why choose uk page for ebook section
 
 
-## [2019.08.08](https://github.com/uktrade/directory-cms/releases/tag/2019.08.06)
-[Full Changelog](https://github.com/uktrade/directory-cms/compare/2019.07.24...2019.08.06)
+## [2019.08.08](https://github.com/uktrade/directory-cms/releases/tag/2019.08.08)
+[Full Changelog](https://github.com/uktrade/directory-cms/compare/2019.07.24...2019.08.08)
 
 - CMS-1774 - Use correct slug for Invest region landing page for tree based routing
 - CMS-1596 - Use correct slugs for new FAS pages under great international for tree based routing. Hide "uses tree-based routing" checkbox from admin panels

components/migrations/0005_auto_20190823_1036.py

@@ -0,0 +1,59 @@
+# Generated by Django 2.2.4 on 2019-08-23 10:36
+
+import core.model_fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('components', '0004_auto_20190417_1024'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content',
+            field=core.model_fields.MarkdownField(),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_ar',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_de',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_en_gb',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_es',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_fr',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_ja',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_pt',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='bannercomponent',
+            name='banner_content_zh_hans',
+            field=core.model_fields.MarkdownField(null=True),
+        ),
+    ]

core/helpers.py

@@ -189,7 +189,6 @@ def render_markdown(text, context=None):
         extensions=[
             'tables',
             'smarty',
-            LinkerExtension()
         ],
         output_format='html5'
     )

core/model_fields.py

@@ -1,15 +1,9 @@
 from django.db.models import TextField
 
-from core import validators as core_validators, widgets
+from core import widgets
 
 
 class MarkdownField(TextField):
-    def __init__(self, validators=None, *args, **kwargs):
-        validators = validators or []
-        if core_validators.slug_hyperlinks not in validators:
-            validators.append(core_validators.slug_hyperlinks)
-        super().__init__(validators=validators, *args, **kwargs)
-
     def formfield(self, **kwargs):
         defaults = {
             'widget': widgets.MarkdownTextarea

core/serializer_mapping.py

@@ -54,6 +54,8 @@
     great_international.models.great_international.AboutDitLandingPage: great_international.serializers.AboutDitLandingPageSerializer,  # NOQA
     great_international.models.great_international.AboutDitServicesPage: great_international.serializers.AboutDitServicesPageSerializer,  # NOQA
     great_international.models.great_international.AboutUkLandingPage: great_international.serializers.AboutUkLandingPageSerializer,  # NOQA
+    great_international.models.great_international.AboutUkRegionPage: great_international.serializers.AboutUkRegionPageSerializer,  # NOQA
+    great_international.models.great_international.AboutUkRegionListingPage: great_international.serializers.AboutUkRegionListingPageSerializer,  # NOQA
     great_international.models.great_international.AboutUkWhyChooseTheUkPage: great_international.serializers.AboutUkWhyChooseTheUkPageSerializer,  # NOQA
     great_international.models.capital_invest.InternationalCapitalInvestLandingPage: great_international.serializers.InternationalCapitalInvestLandingPageSerializer,  # NOQA
     great_international.models.capital_invest.CapitalInvestRegionPage: great_international.serializers.CapitalInvestRegionPageSerializer,  # NOQA