Skip to content
Snippets Groups Projects
Commit 248ef829 authored by Alexa Valentová's avatar Alexa Valentová
Browse files

run hooks

parent 11d6b76c
No related branches found
No related tags found
2 merge requests!997Release,!996Fix articles filtering
Pipeline #18623 passed
# Generated by Django 5.0.6 on 2024-06-11 08:39 # Generated by Django 5.0.6 on 2024-06-11 08:39
import shared.blocks.main
import wagtail.blocks import wagtail.blocks
import wagtail.fields import wagtail.fields
import wagtail.images.blocks import wagtail.images.blocks
from django.db import migrations from django.db import migrations
import shared.blocks.main
class Migration(migrations.Migration):
class Migration(migrations.Migration):
dependencies = [ dependencies = [
('district', '0219_alter_districtelectioncampaignpage_options_and_more'), ("district", "0219_alter_districtelectioncampaignpage_options_and_more"),
] ]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name='districthomepage', model_name="districthomepage",
name='content', name="content",
field=wagtail.fields.StreamField([('fullscreen_header_block', wagtail.blocks.StructBlock([('desktop_image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybráno video, ukáže se na desktopu.', label='Obrázek na pozadí (desktop)', required=False)), ('mobile_image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybráno video, ukáže se na mobilu.', label='Obrázek na pozadí (mobil)', required=False)), ('desktop_video_url', wagtail.blocks.URLBlock(help_text='Pokud je vybráno, ukáže se na desktopech s povoleným autoplayem místo obrázku.', label='Video (desktop)', required=False)), ('mobile_video_url', wagtail.blocks.URLBlock(help_text='Pokud je vybráno, ukáže se na mobilech s povoleným autoplayem místo obrázku.', label='Video (mobil)', required=False)), ('desktop_line_1', wagtail.blocks.TextBlock(label='Desktop první řádek')), ('desktop_line_2', wagtail.blocks.TextBlock(label='Desktop druhý řádek', required=False)), ('mobile_line_1', wagtail.blocks.TextBlock(label='První mobilní řádek')), ('mobile_line_2', wagtail.blocks.TextBlock(label='Druhý mobilní řádek', required=False)), ('mobile_line_3', wagtail.blocks.TextBlock(label='Třetí mobilní řádek', required=False)), ('button_url', wagtail.blocks.URLBlock(help_text='Bez odkazu tlačítko nebude viditelné.', label='Odkaz tlačítka', required=False)), ('button_text', wagtail.blocks.CharBlock(label='Text tlačítka', required=False))])), ('news_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text='Nejnovější články se načtou automaticky', label='Titulek')), ('description', wagtail.blocks.TextBlock(label='Popis', required=False))], template='styleguide2/includes/organisms/articles/district/articles_section.html')), ('elections_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', required=True)), ('text_before_countdown', wagtail.blocks.CharBlock(default='Aktuálně zbývá', label='Text před odpočtem', required=True)), ('countdown_timestamp', wagtail.blocks.DateTimeBlock(label='Datum & čas voleb', required=True)), ('buttons', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', max_length=128, required=True)), ('page', wagtail.blocks.PageChooserBlock(label='Stránka', required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Tlačítka', required=False))])), ('people_block', wagtail.blocks.StructBlock([('title_line_1', wagtail.blocks.CharBlock(label='První řádek titulku')), ('title_line_2', wagtail.blocks.CharBlock(label='Druhý řádek titulku')), ('description', wagtail.blocks.TextBlock(label='Popis')), ('list', wagtail.blocks.ListBlock(shared.blocks.main.BoxBlock, label='Boxíky'))], template='styleguide2/includes/organisms/main_section/district/representatives_section.html')), ('calendar_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', required=False))])), ('newsletter_block', wagtail.blocks.StructBlock([]))], blank=True, verbose_name='Obsah'), field=wagtail.fields.StreamField(
[
(
"fullscreen_header_block",
wagtail.blocks.StructBlock(
[
(
"desktop_image",
wagtail.images.blocks.ImageChooserBlock(
help_text="Pokud není vybráno video, ukáže se na desktopu.",
label="Obrázek na pozadí (desktop)",
required=False,
),
),
(
"mobile_image",
wagtail.images.blocks.ImageChooserBlock(
help_text="Pokud není vybráno video, ukáže se na mobilu.",
label="Obrázek na pozadí (mobil)",
required=False,
),
),
(
"desktop_video_url",
wagtail.blocks.URLBlock(
help_text="Pokud je vybráno, ukáže se na desktopech s povoleným autoplayem místo obrázku.",
label="Video (desktop)",
required=False,
),
),
(
"mobile_video_url",
wagtail.blocks.URLBlock(
help_text="Pokud je vybráno, ukáže se na mobilech s povoleným autoplayem místo obrázku.",
label="Video (mobil)",
required=False,
),
),
(
"desktop_line_1",
wagtail.blocks.TextBlock(
label="Desktop první řádek"
),
),
(
"desktop_line_2",
wagtail.blocks.TextBlock(
label="Desktop druhý řádek", required=False
),
),
(
"mobile_line_1",
wagtail.blocks.TextBlock(
label="První mobilní řádek"
),
),
(
"mobile_line_2",
wagtail.blocks.TextBlock(
label="Druhý mobilní řádek", required=False
),
),
(
"mobile_line_3",
wagtail.blocks.TextBlock(
label="Třetí mobilní řádek", required=False
),
),
(
"button_url",
wagtail.blocks.URLBlock(
help_text="Bez odkazu tlačítko nebude viditelné.",
label="Odkaz tlačítka",
required=False,
),
),
(
"button_text",
wagtail.blocks.CharBlock(
label="Text tlačítka", required=False
),
),
]
),
),
(
"news_block",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.CharBlock(
help_text="Nejnovější články se načtou automaticky",
label="Titulek",
),
),
(
"description",
wagtail.blocks.TextBlock(
label="Popis", required=False
),
),
],
template="styleguide2/includes/organisms/articles/district/articles_section.html",
),
),
(
"elections_block",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"text_before_countdown",
wagtail.blocks.CharBlock(
default="Aktuálně zbývá",
label="Text před odpočtem",
required=True,
),
),
(
"countdown_timestamp",
wagtail.blocks.DateTimeBlock(
label="Datum & čas voleb", required=True
),
),
(
"buttons",
wagtail.blocks.ListBlock(
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.CharBlock(
label="Titulek",
max_length=128,
required=True,
),
),
(
"page",
wagtail.blocks.PageChooserBlock(
label="Stránka", required=False
),
),
(
"link",
wagtail.blocks.URLBlock(
label="Odkaz", required=False
),
),
]
),
label="Tlačítka",
required=False,
),
),
]
),
),
(
"people_block",
wagtail.blocks.StructBlock(
[
(
"title_line_1",
wagtail.blocks.CharBlock(
label="První řádek titulku"
),
),
(
"title_line_2",
wagtail.blocks.CharBlock(
label="Druhý řádek titulku"
),
),
(
"description",
wagtail.blocks.TextBlock(label="Popis"),
),
(
"list",
wagtail.blocks.ListBlock(
shared.blocks.main.BoxBlock, label="Boxíky"
),
),
],
template="styleguide2/includes/organisms/main_section/district/representatives_section.html",
),
),
(
"calendar_block",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.CharBlock(
label="Titulek", required=False
),
)
]
),
),
("newsletter_block", wagtail.blocks.StructBlock([])),
],
blank=True,
verbose_name="Obsah",
),
), ),
] ]
# Generated by Django 5.0.6 on 2024-06-11 09:23 # Generated by Django 5.0.6 on 2024-06-11 09:23
import django.db.models.deletion import django.db.models.deletion
import shared.models.main
import wagtailmetadata.models import wagtailmetadata.models
from django.db import migrations, models from django.db import migrations, models
import shared.models.main
class Migration(migrations.Migration):
class Migration(migrations.Migration):
dependencies = [ dependencies = [
('district', '0221_alter_districthomepage_content_and_more'), ("district", "0221_alter_districthomepage_content_and_more"),
('wagtailcore', '0093_uploadedfile'), ("wagtailcore", "0093_uploadedfile"),
('wagtailimages', '0026_delete_uploadedimage'), ("wagtailimages", "0026_delete_uploadedimage"),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='DistrictSearchPage', name="DistrictSearchPage",
fields=[ fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), (
('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Search image')), "page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
(
"search_image",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailimages.image",
verbose_name="Search image",
),
),
], ],
options={ options={
'verbose_name': 'Vyhledávací stránka', "verbose_name": "Vyhledávací stránka",
'abstract': False, "abstract": False,
}, },
bases=(shared.models.main.SubpageMixin, wagtailmetadata.models.WagtailImageMetadataMixin, 'wagtailcore.page', models.Model), bases=(
shared.models.main.SubpageMixin,
wagtailmetadata.models.WagtailImageMetadataMixin,
"wagtailcore.page",
models.Model,
),
), ),
] ]
import json import json
from django.http import HttpResponseRedirect
from django.core.cache import cache from django.core.cache import cache
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db import models from django.db import models
from django.http import HttpResponseRedirect
from modelcluster.contrib.taggit import ClusterTaggableManager from modelcluster.contrib.taggit import ClusterTaggableManager
from modelcluster.fields import ParentalKey from modelcluster.fields import ParentalKey
from taggit.models import TaggedItemBase from taggit.models import TaggedItemBase
...@@ -48,8 +48,8 @@ from shared.models import ( ...@@ -48,8 +48,8 @@ from shared.models import (
MainPeoplePageMixin, MainPeoplePageMixin,
MainPersonPageMixin, MainPersonPageMixin,
MainProgramPageMixin, MainProgramPageMixin,
MainSimplePageMixin,
MainSearchPageMixin, MainSearchPageMixin,
MainSimplePageMixin,
PageInMenuMixin, PageInMenuMixin,
PdfPageMixin, PdfPageMixin,
SharedTaggedDistrictArticle, SharedTaggedDistrictArticle,
......
...@@ -26,7 +26,7 @@ def fix_tags_names(apps, schema_editor): ...@@ -26,7 +26,7 @@ def fix_tags_names(apps, schema_editor):
try: try:
tag.save() tag.save()
except Exception as e: except Exception:
# The tag already exists, despite numerous checks # The tag already exists, despite numerous checks
pass pass
......
...@@ -241,20 +241,12 @@ class SocialMixin(Page): ...@@ -241,20 +241,12 @@ class SocialMixin(Page):
class PageInMenuMixin(Page): class PageInMenuMixin(Page):
def get_menu_title(self, parent_instance=None) -> str: def get_menu_title(self, parent_instance=None) -> str:
instance = ( instance = self if parent_instance is None else parent_instance
self
if parent_instance is None
else parent_instance
)
menu_iterator = ( menu_iterator = (
instance.root_page.menu instance.root_page.menu
if hasattr(instance, "root_page") if hasattr(instance, "root_page")
else ( else (instance.menu if hasattr(instance, "menu") else [])
instance.menu
if hasattr(instance, "menu")
else []
)
) )
for menu in menu_iterator: for menu in menu_iterator:
...@@ -1107,7 +1099,9 @@ class MainHomePageMixin( ...@@ -1107,7 +1099,9 @@ class MainHomePageMixin(
context["article_data_list"] = self.materialize_shared_articles_query( context["article_data_list"] = self.materialize_shared_articles_query(
self.append_all_shared_articles_query( self.append_all_shared_articles_query(
self.article_page_model.objects.live().child_of(self.articles_page).all() self.article_page_model.objects.live()
.child_of(self.articles_page)
.all()
).order_by("-union_timestamp")[:3] ).order_by("-union_timestamp")[:3]
) )
...@@ -1274,7 +1268,10 @@ class MainArticlesPageMixin( ...@@ -1274,7 +1268,10 @@ class MainArticlesPageMixin(
def get_base_shared_articles_query(self, filter: models.Q): def get_base_shared_articles_query(self, filter: models.Q):
return self.materialize_shared_articles_query( return self.materialize_shared_articles_query(
self.append_all_shared_articles_query( self.append_all_shared_articles_query(
self.root_page.article_page_model.objects.filter(filter).live().child_of(self).all() self.root_page.article_page_model.objects.filter(filter)
.live()
.child_of(self)
.all()
).order_by("-union_timestamp") ).order_by("-union_timestamp")
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment