diff --git a/shared/models/main.py b/shared/models/main.py index 55da9f40b8fde55bb62f1a176a3c2dba2c20c151..a1fef210bf89648ca8b72795d312d793d9a7f1cf 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 b8b09511129ee22e7eeaf583487f147fe74ffdda..98e2e60952becb921cc73e209ed216876d3198c7 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>