diff --git a/elections/migrations/0001_initial.py b/elections/migrations/0001_initial.py index 967a05daf113980580bdcef6c6c4ba315aebf618..903d74d1f960d57f9bda7f424d8075a72bdca4dc 100644 --- a/elections/migrations/0001_initial.py +++ b/elections/migrations/0001_initial.py @@ -1,13 +1,14 @@ # Generated by Django 4.1.10 on 2024-01-04 15:23 -from django.db import migrations, models import django.db.models.deletion -import shared.blocks.main -import shared.models.base import wagtail.blocks import wagtail.contrib.routable_page.models import wagtail.fields import wagtailmetadata.models +from django.db import migrations, models + +import shared.blocks.main +import shared.models.base class Migration(migrations.Migration): diff --git a/elections/migrations/0002_electionsarticlespage.py b/elections/migrations/0002_electionsarticlespage.py index d059869e4a5965da8dc99b61331f880c65ee869a..93c6c9e790c88d61fbe2232391f319b0f793a946 100644 --- a/elections/migrations/0002_electionsarticlespage.py +++ b/elections/migrations/0002_electionsarticlespage.py @@ -1,11 +1,12 @@ # Generated by Django 4.1.10 on 2024-01-04 15:24 -from django.db import migrations, models import django.db.models.deletion import modelcluster.fields -import shared.models.base import wagtail.contrib.routable_page.models import wagtailmetadata.models +from django.db import migrations, models + +import shared.models.base class Migration(migrations.Migration): diff --git a/elections/migrations/0003_electionsarticlepage_electionssearchpage_and_more.py b/elections/migrations/0003_electionsarticlepage_electionssearchpage_and_more.py index dfa203cd8b5e393f82256c8e16127bacd42bb020..7301da6ad3e408d5cdcb1fc0bbdf807db8d40339 100644 --- a/elections/migrations/0003_electionsarticlepage_electionssearchpage_and_more.py +++ b/elections/migrations/0003_electionsarticlepage_electionssearchpage_and_more.py @@ -1,15 +1,16 @@ # Generated by Django 4.1.10 on 2024-01-04 15:26 -from django.db import migrations, models import django.db.models.deletion import django.utils.timezone import modelcluster.contrib.taggit import modelcluster.fields -import shared.models.base import wagtail.blocks import wagtail.documents.blocks import wagtail.fields import wagtailmetadata.models +from django.db import migrations, models + +import shared.models.base class Migration(migrations.Migration): diff --git a/elections/migrations/0005_alter_electionsarticlepage_shared_tags.py b/elections/migrations/0005_alter_electionsarticlepage_shared_tags.py index 1c2bbcf85b3beca3af17260f7ed8b515f6f1e8fd..04df0372d59690c84e9bae52b467cfb3cf478b87 100644 --- a/elections/migrations/0005_alter_electionsarticlepage_shared_tags.py +++ b/elections/migrations/0005_alter_electionsarticlepage_shared_tags.py @@ -1,7 +1,7 @@ # Generated by Django 4.1.10 on 2024-01-04 16:21 -from django.db import migrations import modelcluster.contrib.taggit +from django.db import migrations class Migration(migrations.Migration): diff --git a/main/migrations/0067_alter_mainarticletag_content_object.py b/main/migrations/0067_alter_mainarticletag_content_object.py index 3bc56cc07fc59c627243d05c68621f0819e11ada..3b64a6e5d03385edffe44384ee5afa4be1d97adf 100644 --- a/main/migrations/0067_alter_mainarticletag_content_object.py +++ b/main/migrations/0067_alter_mainarticletag_content_object.py @@ -1,8 +1,8 @@ # Generated by Django 4.1.10 on 2024-01-04 15:26 -from django.db import migrations import django.db.models.deletion import modelcluster.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/shared/migrations/0004_sharedtaggedelectionsarticle.py b/shared/migrations/0004_sharedtaggedelectionsarticle.py index bacbece5f90d38a19e85fff0e98453f21d00799d..3d594e4afb740751b9fd0baae5219beaa2878dab 100644 --- a/shared/migrations/0004_sharedtaggedelectionsarticle.py +++ b/shared/migrations/0004_sharedtaggedelectionsarticle.py @@ -1,8 +1,8 @@ # Generated by Django 4.1.10 on 2024-01-04 16:14 -from django.db import migrations, models import django.db.models.deletion import modelcluster.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/shared/models/base.py b/shared/models/base.py index b1394fcf34d3c2a83643b611bd7d48a225fdf224..ece1c4dfa6173fb174e7a47375adbc845d1dd354 100644 --- a/shared/models/base.py +++ b/shared/models/base.py @@ -475,7 +475,9 @@ class ArticlesMixin: DistrictArticlePage = apps.get_model(app_label="district.DistrictArticlePage") UniwebArticlePage = apps.get_model(app_label="uniweb.UniwebArticlePage") MainArticlePage = apps.get_model(app_label="main.MainArticlePage") - ElectionsArticlePage = apps.get_model(app_label="elections.ElectionsArticlePage") + ElectionsArticlePage = apps.get_model( + app_label="elections.ElectionsArticlePage" + ) page_type = self.determine_page_type() @@ -490,7 +492,12 @@ class ArticlesMixin: lambda class_dict, field: self.merge_dict( class_dict, {f"union_{field.column}": field} ), - [*main_meta_fields, *elections_meta_fields, *district_meta_fields, *uniweb_meta_fields], + [ + *main_meta_fields, + *elections_meta_fields, + *district_meta_fields, + *uniweb_meta_fields, + ], {}, ) @@ -550,16 +557,20 @@ class ArticlesMixin: ) district_complementary_fields = create_complementary_fields( - district_only_fields, [uniweb_only_fields, main_only_fields, elections_only_fields] + district_only_fields, + [uniweb_only_fields, main_only_fields, elections_only_fields], ) uniweb_complementary_fields = create_complementary_fields( - uniweb_only_fields, [district_only_fields, main_only_fields, elections_only_fields] + uniweb_only_fields, + [district_only_fields, main_only_fields, elections_only_fields], ) main_complementary_fields = create_complementary_fields( - main_only_fields, [uniweb_only_fields, district_only_fields, elections_only_fields] + main_only_fields, + [uniweb_only_fields, district_only_fields, elections_only_fields], ) elections_complementary_fields = create_complementary_fields( - elections_only_fields, [uniweb_only_fields, district_only_fields, main_only_fields] + elections_only_fields, + [uniweb_only_fields, district_only_fields, main_only_fields], ) main_fields = main_only_fields | main_complementary_fields @@ -702,7 +713,9 @@ class ArticlesMixin: DistrictArticlePage = apps.get_model(app_label="district.DistrictArticlePage") UniwebArticlePage = apps.get_model(app_label="uniweb.UniwebArticlePage") MainArticlePage = apps.get_model(app_label="main.MainArticlePage") - ElectionsArticlePage = apps.get_model(app_label="elections.ElectionsArticlePage") + ElectionsArticlePage = apps.get_model( + app_label="elections.ElectionsArticlePage" + ) main_meta_fields = MainArticlePage._meta.fields elections_meta_fields = ElectionsArticlePage._meta.fields @@ -890,7 +903,9 @@ class ArticlesMixin: DistrictArticlePage = apps.get_model(app_label="district.DistrictArticlePage") UniwebArticlePage = apps.get_model(app_label="uniweb.UniwebArticlePage") MainArticlePage = apps.get_model(app_label="main.MainArticlePage") - ElectionsArticlePage = apps.get_model(app_label="elections.ElectionsArticlePage") + ElectionsArticlePage = apps.get_model( + app_label="elections.ElectionsArticlePage" + ) # .search() runs annotate, so its impossible to search after .union() # .search() also returns an object that cannot be broken down by .values()