From 7252151177d605a74a5410b67773948826e71f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Valentov=C3=A1?= <git@imaniti.org>
Date: Wed, 7 Aug 2024 09:27:52 +0200
Subject: [PATCH] fix names
---
shared/models/main.py | 2 ++
.../candidates/candidate_primary_list.html | 24 ++++++++++---------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/shared/models/main.py b/shared/models/main.py
index 55da9f40..a1fef210 100644
--- a/shared/models/main.py
+++ b/shared/models/main.py
@@ -2017,6 +2017,8 @@ class MainPersonPageMixin(
return self.root_page.fallback_image
def get_full_name(self) -> str:
+ print("getting full name")
+
full_name = ""
if self.before_name:
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 b8b09511..98e2e609 100644
--- a/shared/templates/styleguide2/includes/organisms/candidates/candidate_primary_list.html
+++ b/shared/templates/styleguide2/includes/organisms/candidates/candidate_primary_list.html
@@ -5,18 +5,20 @@
id="kandidati"
>
{% for candidate in self.candidates %}
- {% if candidate.image %}
- {% image candidate.image max-756x756 as resized_candidate_image %}
- {% else %}
- {% image candidate.page.image max-756x756 as resized_candidate_image %}
- {% endif %}
+ {% with candidate.page.specific as specific_page %}
+ {% if candidate.image %}
+ {% image candidate.image max-756x756 as resized_candidate_image %}
+ {% else %}
+ {% image specific_page.image max-756x756 as resized_candidate_image %}
+ {% endif %}
- {% firstof candidate.description candidate.page.perex as description %}
+ {% firstof candidate.description specific_page.perex as description %}
- {% if show_job %}
- {% include "styleguide2/includes/molecules/candidates/candidate_primary_box.html" with name=candidate.page.get_full_name position=candidate.page.job description=description url=candidate.page.url candidate_image=resized_candidate_image %}
- {% else %}
- {% include "styleguide2/includes/molecules/candidates/candidate_primary_box.html" with name=candidate.page.get_full_name position=candidate.page.position description=description url=candidate.page.url candidate_image=resized_candidate_image %}
- {% endif %}
+ {% if show_job %}
+ {% include "styleguide2/includes/molecules/candidates/candidate_primary_box.html" with name=specific_page.get_full_name position=specific_page.job description=description url=specific_page.url candidate_image=resized_candidate_image %}
+ {% else %}
+ {% include "styleguide2/includes/molecules/candidates/candidate_primary_box.html" with name=specific_page.get_full_name position=specific_page.position description=description url=specific_page.url candidate_image=resized_candidate_image %}
+ {% endif %}
+ {% endwith %}
{% endfor %}
</ul>
--
GitLab