Skip to content
Snippets Groups Projects
Commit 93c5ace4 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

run hooks

parent a23fd914
Branches
No related tags found
2 merge requests!876Fix shared articles & release elections web,!863Add elections web
Pipeline #16098 passed
# 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):
......
# 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):
......
# 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):
......
# 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):
......
# 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):
......
# 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):
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment