Skip to content
Snippets Groups Projects
Commit 098e0a63 authored by Štěpán Farka's avatar Štěpán Farka
Browse files

[ADD] cross choosing person option

parent 9e25e497
Branches
No related tags found
2 merge requests!439Release,!437Misc enhancements 3
Pipeline #7397 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 262 additions and 4 deletions
district/blocks.py
+ 4
− 1
View file @ 098e0a63
......@@ -187,7 +187,10 @@ class HomepageSimpleHeaderBlock(StructBlock):
class PeopleGroupListBlock(StructBlock):
group_title = CharBlock(label="Titulek", required=True)
person_list = ListBlock(
PageChooserBlock(label="Osoba", page_type=["district.DistrictPersonPage"]),
PageChooserBlock(
label="Osoba",
page_type=["district.DistrictPersonPage", "region.RegionPersonPage"],
),
label="List osob",
)
......
district/migrations/0050_alter_districtcrossroadpage_content_and_more.py 0 → 100644
+ 126
− 0
View file @ 098e0a63
# Generated by Django 4.0.3 on 2022-04-01 10:49
import wagtail.contrib.table_block.blocks
import wagtail.core.blocks
import wagtail.core.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("district", "0049_alter_districtcrossroadpage_cards_content"),
]
operations = [
migrations.AlterField(
model_name="districtcrossroadpage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"people_group",
wagtail.core.blocks.StructBlock(
[
(
"group_title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"person_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=[
"district.DistrictPersonPage",
"region.RegionPersonPage",
],
),
label="List osob",
),
),
]
),
)
],
blank=True,
verbose_name="Obsah stránky",
),
),
migrations.AlterField(
model_name="districtcustompage",
name="content",
field=wagtail.core.fields.StreamField(
[
("text", wagtail.core.blocks.RichTextBlock()),
("table", wagtail.contrib.table_block.blocks.TableBlock()),
(
"people_group",
wagtail.core.blocks.StructBlock(
[
(
"group_title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"person_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=[
"district.DistrictPersonPage",
"region.RegionPersonPage",
],
),
label="List osob",
),
),
]
),
),
],
blank=True,
verbose_name="Obsah",
),
),
migrations.AlterField(
model_name="districtpeoplepage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"people_group",
wagtail.core.blocks.StructBlock(
[
(
"group_title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"person_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=[
"district.DistrictPersonPage",
"region.RegionPersonPage",
],
),
label="List osob",
),
),
]
),
)
],
blank=True,
verbose_name="Obsah stránky",
),
),
]
district/templates/district/blocks/people_group_block.html
+ 1
− 1
View file @ 098e0a63
......@@ -3,6 +3,6 @@
</h2>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
{% for person_page in self.person_list %}
{% include "shared/person_badge_snippet.html" %}
{% include "shared/person_badge_snippet.html" with person_page=person_page.specific %}
{% endfor %}
</div>
region/blocks.py
+ 4
− 1
View file @ 098e0a63
......@@ -187,7 +187,10 @@ class HomepageSimpleHeaderBlock(StructBlock):
class PeopleGroupListBlock(StructBlock):
group_title = CharBlock(label="Titulek", required=True)
person_list = ListBlock(
PageChooserBlock(label="Osoba", page_type=["region.RegionPersonPage"]),
PageChooserBlock(
label="Osoba",
page_type=["district.DistrictPersonPage", "region.RegionPersonPage"],
),
label="List osob",
)
......
region/migrations/0025_alter_regioncrossroadpage_content_and_more.py 0 → 100644
+ 126
− 0
View file @ 098e0a63
# Generated by Django 4.0.3 on 2022-04-01 10:48
import wagtail.contrib.table_block.blocks
import wagtail.core.blocks
import wagtail.core.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("region", "0024_alter_regioncrossroadpage_cards_content"),
]
operations = [
migrations.AlterField(
model_name="regioncrossroadpage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"people_group",
wagtail.core.blocks.StructBlock(
[
(
"group_title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"person_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=[
"district.DistrictPersonPage",
"region.RegionPersonPage",
],
),
label="List osob",
),
),
]
),
)
],
blank=True,
verbose_name="Obsah stránky",
),
),
migrations.AlterField(
model_name="regioncustompage",
name="content",
field=wagtail.core.fields.StreamField(
[
("text", wagtail.core.blocks.RichTextBlock()),
("table", wagtail.contrib.table_block.blocks.TableBlock()),
(
"people_group",
wagtail.core.blocks.StructBlock(
[
(
"group_title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"person_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=[
"district.DistrictPersonPage",
"region.RegionPersonPage",
],
),
label="List osob",
),
),
]
),
),
],
blank=True,
verbose_name="Obsah",
),
),
migrations.AlterField(
model_name="regionpeoplepage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"people_group",
wagtail.core.blocks.StructBlock(
[
(
"group_title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"person_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=[
"district.DistrictPersonPage",
"region.RegionPersonPage",
],
),
label="List osob",
),
),
]
),
)
],
blank=True,
verbose_name="Obsah stránky",
),
),
]
region/templates/region/blocks/people_group_block.html
+ 1
− 1
View file @ 098e0a63
......@@ -3,6 +3,6 @@
</h2>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
{% for person_page in self.person_list %}
{% include "shared/person_badge_snippet.html" %}
{% include "shared/person_badge_snippet.html" with person_page=person_page.specific %}
{% endfor %}
</div>
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