From 9910831925fdf69fcc5dd969d9f80d4684da4312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com> Date: Mon, 13 Jun 2022 10:07:37 +0200 Subject: [PATCH] district: Fix migrations so they work on clean installation --- .../0037_districtcrossroadpage_districtcustompage.py | 2 +- district/migrations/0038_auto_20220303_1107.py | 6 +++--- .../0050_alter_districtcrossroadpage_content_and_more.py | 3 --- .../0054_alter_districtcenterpage_content_and_more.py | 1 - .../0055_alter_districtarticlepage_content_and_more.py | 1 - .../0055_alter_districtcenterpage_content_and_more.py | 1 - .../0061_alter_districtarticlepage_content_and_more.py | 1 - .../0066_alter_districtarticlepage_content_and_more.py | 4 ---- district/migrations/0067_delete_all_superseded_pages.py | 7 +++++-- .../0087_delete_all_districttagspage_instances.py | 8 +++++--- 10 files changed, 14 insertions(+), 20 deletions(-) diff --git a/district/migrations/0037_districtcrossroadpage_districtcustompage.py b/district/migrations/0037_districtcrossroadpage_districtcustompage.py index e5487ee0..562ea69d 100644 --- a/district/migrations/0037_districtcrossroadpage_districtcustompage.py +++ b/district/migrations/0037_districtcrossroadpage_districtcustompage.py @@ -99,7 +99,7 @@ class Migration(migrations.Migration): "district.DistrictContactPage", "district.DistrictCrossroadPage", "district.DistrictCustomPage", - "district.DistrictElectionPage", + # "district.DistrictElectionPage", "district.DistrictPeoplePage", "district.DistrictProgramPage", # "district.DistrictTagsPage", diff --git a/district/migrations/0038_auto_20220303_1107.py b/district/migrations/0038_auto_20220303_1107.py index 9486a7a9..62dd8fbc 100644 --- a/district/migrations/0038_auto_20220303_1107.py +++ b/district/migrations/0038_auto_20220303_1107.py @@ -56,15 +56,15 @@ class Migration(migrations.Migration): wagtail.core.blocks.PageChooserBlock( label="Stránka", page_type=[ - "district.DistrictAfterElectionPage", + # "district.DistrictAfterElectionPage", "district.DistrictArticlePage", "district.DistrictArticlesPage", "district.DistrictCenterPage", "district.DistrictContactPage", "district.DistrictCrossroadPage", "district.DistrictCustomPage", - "district.DistrictElectionPage", - "district.DistrictElectionPointPage", + # "district.DistrictElectionPage", + # "district.DistrictElectionPointPage", "district.DistrictPeoplePage", "district.DistrictPersonPage", "district.DistrictProgramPage", diff --git a/district/migrations/0050_alter_districtcrossroadpage_content_and_more.py b/district/migrations/0050_alter_districtcrossroadpage_content_and_more.py index bc474329..db113c46 100644 --- a/district/migrations/0050_alter_districtcrossroadpage_content_and_more.py +++ b/district/migrations/0050_alter_districtcrossroadpage_content_and_more.py @@ -35,7 +35,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", @@ -73,7 +72,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", @@ -109,7 +107,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", diff --git a/district/migrations/0054_alter_districtcenterpage_content_and_more.py b/district/migrations/0054_alter_districtcenterpage_content_and_more.py index c83fb639..8878409f 100644 --- a/district/migrations/0054_alter_districtcenterpage_content_and_more.py +++ b/district/migrations/0054_alter_districtcenterpage_content_and_more.py @@ -59,7 +59,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", diff --git a/district/migrations/0055_alter_districtarticlepage_content_and_more.py b/district/migrations/0055_alter_districtarticlepage_content_and_more.py index 67289e95..7e362683 100644 --- a/district/migrations/0055_alter_districtarticlepage_content_and_more.py +++ b/district/migrations/0055_alter_districtarticlepage_content_and_more.py @@ -122,7 +122,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", diff --git a/district/migrations/0055_alter_districtcenterpage_content_and_more.py b/district/migrations/0055_alter_districtcenterpage_content_and_more.py index d6079583..068d2d31 100644 --- a/district/migrations/0055_alter_districtcenterpage_content_and_more.py +++ b/district/migrations/0055_alter_districtcenterpage_content_and_more.py @@ -49,7 +49,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", diff --git a/district/migrations/0061_alter_districtarticlepage_content_and_more.py b/district/migrations/0061_alter_districtarticlepage_content_and_more.py index 14618534..c0eefdd4 100644 --- a/district/migrations/0061_alter_districtarticlepage_content_and_more.py +++ b/district/migrations/0061_alter_districtarticlepage_content_and_more.py @@ -140,7 +140,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", diff --git a/district/migrations/0066_alter_districtarticlepage_content_and_more.py b/district/migrations/0066_alter_districtarticlepage_content_and_more.py index 8d734a4b..268e9ed7 100644 --- a/district/migrations/0066_alter_districtarticlepage_content_and_more.py +++ b/district/migrations/0066_alter_districtarticlepage_content_and_more.py @@ -14320,7 +14320,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", @@ -19048,7 +19047,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", @@ -28505,7 +28503,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", @@ -33243,7 +33240,6 @@ class Migration(migrations.Migration): label="Osoba", page_type=[ "district.DistrictPersonPage", - "region.RegionPersonPage", ], ), label="List osob", diff --git a/district/migrations/0067_delete_all_superseded_pages.py b/district/migrations/0067_delete_all_superseded_pages.py index 7fd29302..004771ca 100644 --- a/district/migrations/0067_delete_all_superseded_pages.py +++ b/district/migrations/0067_delete_all_superseded_pages.py @@ -12,8 +12,11 @@ def delete_all_superseded_page_types(apps, schema_editor): "districtelectionpage", "districtelectionpointpage", ): - ct = ContentType.objects.get(app_label="district", model=model) - Page.objects.filter(content_type=ct).delete() + try: + ct = ContentType.objects.get(app_label="district", model=model) + Page.objects.filter(content_type=ct).delete() + except ContentType.DoesNotExist: + pass class Migration(migrations.Migration): diff --git a/district/migrations/0087_delete_all_districttagspage_instances.py b/district/migrations/0087_delete_all_districttagspage_instances.py index b403aa62..f9bb27c1 100644 --- a/district/migrations/0087_delete_all_districttagspage_instances.py +++ b/district/migrations/0087_delete_all_districttagspage_instances.py @@ -7,9 +7,11 @@ def delete_all_district_tags_pages(apps, schema_editor): Page = apps.get_model("wagtailcore", "Page") ContentType = apps.get_model("contenttypes", "ContentType") - ct = ContentType.objects.get(app_label="district", model="districttagspage") - - Page.objects.filter(content_type=ct).delete() + try: + ct = ContentType.objects.get(app_label="district", model="districttagspage") + Page.objects.filter(content_type=ct).delete() + except ContentType.DoesNotExist: + pass class Migration(migrations.Migration): -- GitLab