From 93c5ace487ccae6214e2dd0798670695b6873730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Thu, 4 Jan 2024 17:23:45 +0100
Subject: [PATCH] run hooks
---
elections/migrations/0001_initial.py | 7 +++--
.../migrations/0002_electionsarticlespage.py | 5 +--
...rticlepage_electionssearchpage_and_more.py | 5 +--
..._alter_electionsarticlepage_shared_tags.py | 2 +-
...067_alter_mainarticletag_content_object.py | 2 +-
.../0004_sharedtaggedelectionsarticle.py | 2 +-
shared/models/base.py | 31 ++++++++++++++-----
7 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/elections/migrations/0001_initial.py b/elections/migrations/0001_initial.py
index 967a05da..903d74d1 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 d059869e..93c6c9e7 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 dfa203cd..7301da6a 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 1c2bbcf8..04df0372 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 3bc56cc0..3b64a6e5 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 bacbece5..3d594e4a 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 b1394fcf..ece1c4df 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()
--
GitLab