From eb8b69f6d36c024ae608f14aa9dccfa718ef04c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Fri, 20 Aug 2021 16:06:03 +0200
Subject: [PATCH] elections2021: Program in nutshell
---
.../migrations/0044_auto_20210820_1602.py | 84 +++++++++++++++++++
elections2021/models.py | 14 +++-
.../elections2021/_nutshell_item_block.html | 2 +-
3 files changed, 96 insertions(+), 4 deletions(-)
create mode 100644 elections2021/migrations/0044_auto_20210820_1602.py
diff --git a/elections2021/migrations/0044_auto_20210820_1602.py b/elections2021/migrations/0044_auto_20210820_1602.py
new file mode 100644
index 00000000..3be7bca8
--- /dev/null
+++ b/elections2021/migrations/0044_auto_20210820_1602.py
@@ -0,0 +1,84 @@
+# Generated by Django 3.2.6 on 2021-08-20 14:02
+
+import wagtail.core.blocks
+import wagtail.core.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("elections2021", "0043_auto_20210820_1443"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="elections2021programinnutshellpage",
+ name="body",
+ field=wagtail.core.fields.RichTextField(
+ blank=True, null=True, verbose_name="obsah"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="elections2021programinnutshellpage",
+ name="content",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "section",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(label="nadpis"),
+ ),
+ (
+ "items",
+ wagtail.core.blocks.ListBlock(
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "text",
+ wagtail.core.blocks.TextBlock(
+ label="text"
+ ),
+ ),
+ (
+ "points",
+ wagtail.core.blocks.ListBlock(
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.TextBlock(
+ label="titulek"
+ ),
+ ),
+ (
+ "point",
+ wagtail.core.blocks.PageChooserBlock(
+ label="programový bod",
+ page_type=[
+ "elections2021.Elections2021ProgramPointPage"
+ ],
+ ),
+ ),
+ ]
+ ),
+ label="programové body",
+ ),
+ ),
+ ]
+ ),
+ label="bloky",
+ ),
+ ),
+ ]
+ ),
+ )
+ ],
+ blank=True,
+ verbose_name="sekce",
+ ),
+ ),
+ ]
diff --git a/elections2021/models.py b/elections2021/models.py
index 1a05b34c..55ad30f7 100644
--- a/elections2021/models.py
+++ b/elections2021/models.py
@@ -2742,9 +2742,17 @@ class Elections2021MapPage(SubpageMixin, MetadataPageMixin, Page):
class NutshellItemBlock(blocks.StructBlock):
text = blocks.TextBlock(label="text")
points = blocks.ListBlock(
- blocks.PageChooserBlock(
- label="programový bod",
- page_type=["elections2021.Elections2021ProgramPointPage"],
+ blocks.StructBlock(
+ [
+ ("title", blocks.TextBlock(label="titulek")),
+ (
+ "point",
+ blocks.PageChooserBlock(
+ label="programový bod",
+ page_type=["elections2021.Elections2021ProgramPointPage"],
+ ),
+ ),
+ ]
),
label="programové body",
)
diff --git a/elections2021/templates/elections2021/_nutshell_item_block.html b/elections2021/templates/elections2021/_nutshell_item_block.html
index 46993659..e5e61938 100644
--- a/elections2021/templates/elections2021/_nutshell_item_block.html
+++ b/elections2021/templates/elections2021/_nutshell_item_block.html
@@ -5,7 +5,7 @@
<div class="hidden-content">
<ul class="unordered-list">
{% for point in item.points %}
- <li><a href="{% pageurl point %}" class="text-fxactivecolor underline">{{ point.title }}</a></li>
+ <li><a href="{% pageurl point.point %}" class="text-fxactivecolor underline">{{ point.title }}</a></li>
{% endfor %}
</ul>
</div>
--
GitLab