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 595200ba63603c4c35b0e31e8ee521594c9ca382..3f3b598a1cd5c3f4feade84eb46c282ee6f25a48 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 0d812b0215c3aedc0d331911edd422cffa55e7b6..9be17a26d0a7210fc1fd8e3ce198b2d55e059294 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 8e6a614a462b17e24db12dff38a125838a5e7f7a..214b214183edcc85bf63cae76290b1e0e6558f6c 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>