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

run hooks

parent 400b2971
No related branches found
No related tags found
2 merge requests!876Fix shared articles & release elections web,!864Release elections web (v2)
Pipeline #16162 passed
Stage: build
Show whitespace changes
Inline Side-by-side
elections/blocks.py
+ 6
− 18
View file @ 14ea2745
......@@ -88,13 +88,9 @@ class ProgramBlock(StructBlock):
class PersonFaqAnswerBlock(StructBlock):
question = CharBlock(
label="Otázka"
)
question = CharBlock(label="Otázka")
answer = TextBlock(
label="Odpověď"
)
answer = TextBlock(label="Odpověď")
class Meta:
icon = "form"
......@@ -103,18 +99,13 @@ class PersonFaqAnswerBlock(StructBlock):
class PersonFaqAnswersBlock(StructBlock):
section_name = CharBlock(
label="Název sekce",
help_text="Např. 'Otevřenost a transparentnost'"
label="Název sekce", help_text="Např. 'Otevřenost a transparentnost'"
)
topic = CharBlock(
label="Téma",
help_text="Např. 'téma Markéty Gregorové'"
)
topic = CharBlock(label="Téma", help_text="Např. 'téma Markéty Gregorové'")
person_page = PageChooserBlock(
label="Stránka kandidáta",
page_type=["elections.ElectionsCandidatePage"]
label="Stránka kandidáta", page_type=["elections.ElectionsCandidatePage"]
)
image = ImageChooserBlock(
......@@ -123,10 +114,7 @@ class PersonFaqAnswersBlock(StructBlock):
required=False,
)
questions = ListBlock(
PersonFaqAnswerBlock(label="Odpověď"),
label="Otázky"
)
questions = ListBlock(PersonFaqAnswerBlock(label="Odpověď"), label="Otázky")
class Meta:
icon = "form"
......
elections/migrations/0003_electionsfaqpage.py
+ 119
− 15
View file @ 14ea2745
# Generated by Django 4.1.10 on 2024-01-08 12:25
from django.db import migrations, models
import django.db.models.deletion
import shared.models.base
import wagtail.blocks
import wagtail.fields
import wagtail.images.blocks
import wagtailmetadata.models
from django.db import migrations, models
import shared.models.base
class Migration(migrations.Migration):
class Migration(migrations.Migration):
dependencies = [
('calendar_utils', '0004_auto_20220505_1228'),
('wagtailcore', '0083_workflowcontenttype'),
('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
('elections', '0002_initial'),
("calendar_utils", "0004_auto_20220505_1228"),
("wagtailcore", "0083_workflowcontenttype"),
("wagtailimages", "0025_alter_image_file_alter_rendition_file"),
("elections", "0002_initial"),
]
operations = [
migrations.CreateModel(
name='ElectionsFaqPage',
name="ElectionsFaqPage",
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')),
('calendar_url', models.URLField(blank=True, help_text='Kalendář se po uložení stránky aktualizuje na pozadí. U plnějších kalendářů to může trvat i desítky sekund.', null=True, verbose_name='URL kalendáře ve formátu iCal')),
('content', wagtail.fields.StreamField([('person_answers', wagtail.blocks.StructBlock([('topic', wagtail.blocks.CharBlock(help_text="Např. 'téma Markéty Gregorové'", label='Téma')), ('person', wagtail.blocks.PageChooserBlock(label='Stránka kandidáta', page_type=['elections.ElectionsCandidatePage'])), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybrán, použije se obrázek ze stránky kandidáta', label='Obrázek', required=False)), ('questions', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('question', wagtail.blocks.CharBlock(label='Otázka')), ('answer', wagtail.blocks.TextBlock(label='Odpověď'))], label='Odpověď'), label='Otázky'))]))], blank=True, use_json_field=True, verbose_name='Obsah')),
('calendar', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='calendar_utils.calendar')),
('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",
),
),
(
"calendar_url",
models.URLField(
blank=True,
help_text="Kalendář se po uložení stránky aktualizuje na pozadí. U plnějších kalendářů to může trvat i desítky sekund.",
null=True,
verbose_name="URL kalendáře ve formátu iCal",
),
),
(
"content",
wagtail.fields.StreamField(
[
(
"person_answers",
wagtail.blocks.StructBlock(
[
(
"topic",
wagtail.blocks.CharBlock(
help_text="Např. 'téma Markéty Gregorové'",
label="Téma",
),
),
(
"person",
wagtail.blocks.PageChooserBlock(
label="Stránka kandidáta",
page_type=[
"elections.ElectionsCandidatePage"
],
),
),
(
"image",
wagtail.images.blocks.ImageChooserBlock(
help_text="Pokud není vybrán, použije se obrázek ze stránky kandidáta",
label="Obrázek",
required=False,
),
),
(
"questions",
wagtail.blocks.ListBlock(
wagtail.blocks.StructBlock(
[
(
"question",
wagtail.blocks.CharBlock(
label="Otázka"
),
),
(
"answer",
wagtail.blocks.TextBlock(
label="Odpověď"
),
),
],
label="Odpověď",
),
label="Otázky",
),
),
]
),
)
],
blank=True,
use_json_field=True,
verbose_name="Obsah",
),
),
(
"calendar",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
to="calendar_utils.calendar",
),
),
(
"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={
'abstract': False,
"abstract": False,
},
bases=(shared.models.base.SubpageMixin, wagtailmetadata.models.WagtailImageMetadataMixin, 'wagtailcore.page', models.Model),
bases=(
shared.models.base.SubpageMixin,
wagtailmetadata.models.WagtailImageMetadataMixin,
"wagtailcore.page",
models.Model,
),
),
]
elections/migrations/0004_alter_electionsfaqpage_options.py
+ 3
− 4
View file @ 14ea2745
......@@ -4,14 +4,13 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('elections', '0003_electionsfaqpage'),
("elections", "0003_electionsfaqpage"),
]
operations = [
migrations.AlterModelOptions(
name='electionsfaqpage',
options={'verbose_name': 'Otázky a odpovědi'},
name="electionsfaqpage",
options={"verbose_name": "Otázky a odpovědi"},
),
]
elections/migrations/0005_electionsfaqpage_all_topics_name_and_more.py
+ 78
− 9
View file @ 14ea2745
# Generated by Django 4.1.10 on 2024-01-09 08:21
from django.db import migrations, models
import wagtail.blocks
import wagtail.fields
import wagtail.images.blocks
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('elections', '0004_alter_electionsfaqpage_options'),
("elections", "0004_alter_electionsfaqpage_options"),
]
operations = [
migrations.AddField(
model_name='electionsfaqpage',
name='all_topics_name',
field=models.CharField(default='všechna témata', help_text="např. 'všechna témata'", max_length=32, verbose_name='Nadpis štítku pro všechna témata'),
model_name="electionsfaqpage",
name="all_topics_name",
field=models.CharField(
default="všechna témata",
help_text="např. 'všechna témata'",
max_length=32,
verbose_name="Nadpis štítku pro všechna témata",
),
preserve_default=False,
),
migrations.AlterField(
model_name='electionsfaqpage',
name='content',
field=wagtail.fields.StreamField([('person_answers', wagtail.blocks.StructBlock([('section_name', wagtail.blocks.CharBlock(help_text="Např. 'Otevřenost a transparentnost'", label='Název sekce')), ('topic', wagtail.blocks.CharBlock(help_text="Např. 'téma Markéty Gregorové'", label='Téma')), ('person_page', wagtail.blocks.PageChooserBlock(label='Stránka kandidáta', page_type=['elections.ElectionsCandidatePage'])), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybrán, použije se obrázek ze stránky kandidáta', label='Obrázek', required=False)), ('questions', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('question', wagtail.blocks.CharBlock(label='Otázka')), ('answer', wagtail.blocks.TextBlock(label='Odpověď'))], label='Odpověď'), label='Otázky'))]))], blank=True, use_json_field=True, verbose_name='Obsah'),
model_name="electionsfaqpage",
name="content",
field=wagtail.fields.StreamField(
[
(
"person_answers",
wagtail.blocks.StructBlock(
[
(
"section_name",
wagtail.blocks.CharBlock(
help_text="Např. 'Otevřenost a transparentnost'",
label="Název sekce",
),
),
(
"topic",
wagtail.blocks.CharBlock(
help_text="Např. 'téma Markéty Gregorové'",
label="Téma",
),
),
(
"person_page",
wagtail.blocks.PageChooserBlock(
label="Stránka kandidáta",
page_type=["elections.ElectionsCandidatePage"],
),
),
(
"image",
wagtail.images.blocks.ImageChooserBlock(
help_text="Pokud není vybrán, použije se obrázek ze stránky kandidáta",
label="Obrázek",
required=False,
),
),
(
"questions",
wagtail.blocks.ListBlock(
wagtail.blocks.StructBlock(
[
(
"question",
wagtail.blocks.CharBlock(
label="Otázka"
),
),
(
"answer",
wagtail.blocks.TextBlock(
label="Odpověď"
),
),
],
label="Odpověď",
),
label="Otázky",
),
),
]
),
)
],
blank=True,
use_json_field=True,
verbose_name="Obsah",
),
),
]
elections/models.py
+ 1
− 1
View file @ 14ea2745
......@@ -301,7 +301,7 @@ class ElectionsFaqPage(
all_topics_name = models.CharField(
"Nadpis štítku pro všechna témata",
max_length=32,
help_text="např. 'všechna témata'"
help_text="např. 'všechna témata'",
)
## PANELS
......
shared/static/styleguide2/pirati-ui.svg
+ 1
− 1
View file @ 14ea2745
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft