From 9c27209be3e1f701e20ba8eab1ffc6ec4358eb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Thu, 13 Jun 2024 13:12:54 +0200
Subject: [PATCH] remove desc. requirement
---
.../0211_alter_districtcrossroadpage_cards_content_and_more.py | 2 +-
shared/blocks/main.py | 1 +
.../includes/organisms/candidates/candidate_primary_list.html | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/district/migrations/0211_alter_districtcrossroadpage_cards_content_and_more.py b/district/migrations/0211_alter_districtcrossroadpage_cards_content_and_more.py
index 595200ba..3f3b598a 100644
--- a/district/migrations/0211_alter_districtcrossroadpage_cards_content_and_more.py
+++ b/district/migrations/0211_alter_districtcrossroadpage_cards_content_and_more.py
@@ -194,7 +194,7 @@ class Migration(migrations.Migration):
"district.DistrictContactPage",
"district.DistrictCrossroadPage",
"district.DistrictCustomPage",
- "district.DistrictElectionRootPage",
+ # "district.DistrictElectionRootPage",
"district.DistrictPeoplePage",
# "district.DistrictProgramPage",
# "district.DistrictInteractiveProgramPage",
diff --git a/shared/blocks/main.py b/shared/blocks/main.py
index 0d812b02..9be17a26 100644
--- a/shared/blocks/main.py
+++ b/shared/blocks/main.py
@@ -314,6 +314,7 @@ class CandidateBlock(StructBlock):
description = TextBlock(
label="Popis",
+ required=False
)
class Meta:
diff --git a/shared/templates/styleguide2/includes/organisms/candidates/candidate_primary_list.html b/shared/templates/styleguide2/includes/organisms/candidates/candidate_primary_list.html
index 8e6a614a..214b2141 100644
--- a/shared/templates/styleguide2/includes/organisms/candidates/candidate_primary_list.html
+++ b/shared/templates/styleguide2/includes/organisms/candidates/candidate_primary_list.html
@@ -11,6 +11,7 @@
{% image candidate.page.image max-756x756 as resized_candidate_image %}
{% endif %}
- {% include "styleguide2/includes/molecules/candidates/candidate_primary_box.html" with name=candidate.page.title position=candidate.page.position description=candidate.description url=candidate.page.url candidate_image=resized_candidate_image %}
+ {% firstof candidate.description candidate.page.perex as description %}
+ {% include "styleguide2/includes/molecules/candidates/candidate_primary_box.html" with name=candidate.page.title position=candidate.page.position description=description url=candidate.page.url candidate_image=resized_candidate_image %}
{% endfor %}
</ul>
--
GitLab