From dc826a997e0bd1f1a423363ba8e5e7b5f044acd8 Mon Sep 17 00:00:00 2001 From: eadpearce Date: Wed, 14 Aug 2019 10:41:14 +0100 Subject: [PATCH 1/3] Make teaser field optional in international articles --- .../migrations/0067_auto_20190814_0940.py | 58 +++++++++++++++++++ .../models/great_international.py | 1 + 2 files changed, 59 insertions(+) create mode 100644 great_international/migrations/0067_auto_20190814_0940.py diff --git a/great_international/migrations/0067_auto_20190814_0940.py b/great_international/migrations/0067_auto_20190814_0940.py new file mode 100644 index 00000000..48055ce4 --- /dev/null +++ b/great_international/migrations/0067_auto_20190814_0940.py @@ -0,0 +1,58 @@ +# Generated by Django 2.2.3 on 2019-08-14 09:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('great_international', '0066_capitalinvestcontactformpage_capitalinvestcontactformsuccesspage'), + ] + + operations = [ + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page'), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_ar', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_de', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_en_gb', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_es', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_fr', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_ja', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_pt', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + migrations.AlterField( + model_name='internationalarticlepage', + name='article_teaser_zh_hans', + field=models.TextField(blank=True, help_text='This is a subheading that displays when the article is featured on another page', null=True), + ), + ] diff --git a/great_international/models/great_international.py b/great_international/models/great_international.py index a7f2f35d..e230e0ae 100644 --- a/great_international/models/great_international.py +++ b/great_international/models/great_international.py @@ -796,6 +796,7 @@ class InternationalArticlePage(panels.InternationalArticlePagePanels, BaseIntern "below the main title on the article page" ) article_teaser = models.TextField( + blank=True, help_text="This is a subheading that displays when the article " "is featured on another page" ) From a1f0c08fd006b402f1225e392ae01afe64eb270b Mon Sep 17 00:00:00 2001 From: eadpearce Date: Wed, 14 Aug 2019 10:41:39 +0100 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89a3da2a..38a340f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Pre-release ### 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` From b4ffb6bc6aa06a0bcb5422373112d88b002e20e8 Mon Sep 17 00:00:00 2001 From: eadpearce Date: Wed, 14 Aug 2019 10:43:54 +0100 Subject: [PATCH 3/3] Update db template --- db_template.sql | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/db_template.sql b/db_template.sql index c5f6c0f9..151211f5 100644 --- a/db_template.sql +++ b/db_template.sql @@ -2,8 +2,8 @@ -- PostgreSQL database dump -- --- Dumped from database version 10.6 (Ubuntu 10.6-0ubuntu0.18.04.1) --- Dumped by pg_dump version 10.6 (Ubuntu 10.6-0ubuntu0.18.04.1) +-- Dumped from database version 9.6.14 +-- Dumped by pg_dump version 11.3 SET statement_timeout = 0; SET lock_timeout = 0; @@ -12,23 +12,10 @@ SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SELECT pg_catalog.set_config('search_path', '', false); SET check_function_bodies = false; +SET xmloption = content; SET client_min_messages = warning; SET row_security = off; --- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - --- - -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; - - SET default_tablespace = ''; SET default_with_oids = false; @@ -13227,6 +13214,7 @@ COPY public.django_migrations (id, app, name, applied) FROM stdin; 358 great_international 0064_merge_20190808_0928 2019-08-08 10:30:16.542222+01 359 great_international 0065_auto_20190808_1032 2019-08-08 11:37:15.180475+01 360 great_international 0066_capitalinvestcontactformpage_capitalinvestcontactformsuccesspage 2019-08-09 09:15:15.500538+01 +361 great_international 0067_auto_20190814_0940 2019-08-14 10:42:44.256149+01 \. @@ -14326,7 +14314,7 @@ SELECT pg_catalog.setval('public.django_content_type_id_seq', 121, true); -- Name: django_migrations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: - -- -SELECT pg_catalog.setval('public.django_migrations_id_seq', 360, true); +SELECT pg_catalog.setval('public.django_migrations_id_seq', 361, true); --