From aca32de46b15d120b4e87b7f033d9e73afbd6748 Mon Sep 17 00:00:00 2001 From: Helen C Date: Fri, 23 Jun 2023 10:43:59 +0100 Subject: [PATCH 1/3] Data migration and update to sub-service page themes --- .../0038_data_migration_subservice_theme.py | 15 +++++++++++++++ .../0039_update_sub_service_theme.py | 18 ++++++++++++++++++ tbx/services/models.py | 9 +++++++++ 3 files changed, 42 insertions(+) create mode 100644 tbx/services/migrations/0038_data_migration_subservice_theme.py create mode 100644 tbx/services/migrations/0039_update_sub_service_theme.py diff --git a/tbx/services/migrations/0038_data_migration_subservice_theme.py b/tbx/services/migrations/0038_data_migration_subservice_theme.py new file mode 100644 index 000000000..9d2233752 --- /dev/null +++ b/tbx/services/migrations/0038_data_migration_subservice_theme.py @@ -0,0 +1,15 @@ +from django.db import migrations + +def update_theme(apps, schema_editor): + page = apps.get_model('services', 'SubServicePage') + page.objects.filter(theme='dark--transparent').update(theme='light') + +class Migration(migrations.Migration): + + dependencies = [ + ('services', '0037_alter_subservicepage_content'), + ] + + operations = [ + migrations.RunPython(update_theme), + ] diff --git a/tbx/services/migrations/0039_update_sub_service_theme.py b/tbx/services/migrations/0039_update_sub_service_theme.py new file mode 100644 index 000000000..2e93d5be0 --- /dev/null +++ b/tbx/services/migrations/0039_update_sub_service_theme.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.18 on 2023-06-23 09:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('services', '0038_data_migration_subservice_theme'), + ] + + operations = [ + migrations.AlterField( + model_name='subservicepage', + name='theme', + field=models.CharField(choices=[('light', 'Light'), ('coral', 'Coral'), ('dark', 'Dark')], default='light', max_length=255), + ), + ] diff --git a/tbx/services/models.py b/tbx/services/models.py index 5f37bddc1..621cbef8e 100644 --- a/tbx/services/models.py +++ b/tbx/services/models.py @@ -356,6 +356,15 @@ class ServicePageProcess(Orderable, BaseServicePageProcess): class SubServicePage(BaseServicePage): + theme = models.CharField( + max_length=255, + choices=( + ("light", "Light"), + ("coral", "Coral"), + ("dark", "Dark"), + ), + default="light", + ) template = "patterns/pages/service/service.html" parent_page_types = ["ServicePage", "propositions.PropositionPage"] From 570205327d90fc516f710def4f08fdf820bca3e3 Mon Sep 17 00:00:00 2001 From: Helen C Date: Fri, 23 Jun 2023 11:14:51 +0100 Subject: [PATCH 2/3] Amend so that service pages are also updated --- .../0039_data_migration_service_theme.py | 18 ++++++++++++++++++ ..._theme.py => 0040_update_services_theme.py} | 9 +++++++-- tbx/services/models.py | 10 ---------- 3 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 tbx/services/migrations/0039_data_migration_service_theme.py rename tbx/services/migrations/{0039_update_sub_service_theme.py => 0040_update_services_theme.py} (52%) diff --git a/tbx/services/migrations/0039_data_migration_service_theme.py b/tbx/services/migrations/0039_data_migration_service_theme.py new file mode 100644 index 000000000..c05a2b9a6 --- /dev/null +++ b/tbx/services/migrations/0039_data_migration_service_theme.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.18 on 2023-06-23 10:08 + +from django.db import migrations + +def update_theme(apps, schema_editor): + page = apps.get_model('services', 'ServicePage') + page.objects.filter(theme='dark--transparent').update(theme='light') + + +class Migration(migrations.Migration): + + dependencies = [ + ('services', '0038_data_migration_subservice_theme'), + ] + + operations = [ + migrations.RunPython(update_theme), + ] diff --git a/tbx/services/migrations/0039_update_sub_service_theme.py b/tbx/services/migrations/0040_update_services_theme.py similarity index 52% rename from tbx/services/migrations/0039_update_sub_service_theme.py rename to tbx/services/migrations/0040_update_services_theme.py index 2e93d5be0..c40f228d7 100644 --- a/tbx/services/migrations/0039_update_sub_service_theme.py +++ b/tbx/services/migrations/0040_update_services_theme.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.18 on 2023-06-23 09:42 +# Generated by Django 3.2.18 on 2023-06-23 10:12 from django.db import migrations, models @@ -6,10 +6,15 @@ class Migration(migrations.Migration): dependencies = [ - ('services', '0038_data_migration_subservice_theme'), + ('services', '0039_data_migration_service_theme'), ] operations = [ + migrations.AlterField( + model_name='servicepage', + name='theme', + field=models.CharField(choices=[('light', 'Light'), ('coral', 'Coral'), ('dark', 'Dark')], default='light', max_length=255), + ), migrations.AlterField( model_name='subservicepage', name='theme', diff --git a/tbx/services/models.py b/tbx/services/models.py index 621cbef8e..2913f4362 100644 --- a/tbx/services/models.py +++ b/tbx/services/models.py @@ -19,7 +19,6 @@ class BaseServicePage(Page): ("light", "Light"), ("coral", "Coral"), ("dark", "Dark"), - ("dark--transparent", "Dark with transparent header"), ), default="light", ) @@ -356,15 +355,6 @@ class ServicePageProcess(Orderable, BaseServicePageProcess): class SubServicePage(BaseServicePage): - theme = models.CharField( - max_length=255, - choices=( - ("light", "Light"), - ("coral", "Coral"), - ("dark", "Dark"), - ), - default="light", - ) template = "patterns/pages/service/service.html" parent_page_types = ["ServicePage", "propositions.PropositionPage"] From 7bdd47a9d59b9f3739dc29a82b9c3418f3112c90 Mon Sep 17 00:00:00 2001 From: Helen C Date: Tue, 27 Jun 2023 10:58:38 +0100 Subject: [PATCH 3/3] add merge migration --- ...38_call_to_action_0040_update_services_theme.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tbx/services/migrations/0041_merge_0038_call_to_action_0040_update_services_theme.py diff --git a/tbx/services/migrations/0041_merge_0038_call_to_action_0040_update_services_theme.py b/tbx/services/migrations/0041_merge_0038_call_to_action_0040_update_services_theme.py new file mode 100644 index 000000000..475e0f13c --- /dev/null +++ b/tbx/services/migrations/0041_merge_0038_call_to_action_0040_update_services_theme.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.18 on 2023-06-27 09:56 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('services', '0038_call_to_action'), + ('services', '0040_update_services_theme'), + ] + + operations = [ + ]