From e6c75645ee130888809a74a31904d16fce0e3c87 Mon Sep 17 00:00:00 2001
From: Jarmil <jarmil.halamicek@seznam.cz>
Date: Thu, 7 Jan 2021 12:26:18 +0100
Subject: [PATCH] Oprava zobrazeni osoby odpovidajici novemu modelu
---
shared/models.py | 7 +++++++
.../templates/shared/person_badge_snippet.html | 18 +++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/shared/models.py b/shared/models.py
index 80549861..229dc5f9 100644
--- a/shared/models.py
+++ b/shared/models.py
@@ -176,6 +176,13 @@ class PersonPage(SharedSubpageMixin, MetadataPageMixin, Page):
class Meta:
verbose_name = "Člověk" # to zni hrde
+ @property
+ def pageperex(self):
+ """Vraci perex Pirata nejblizzsi lokalnimu kontextu.
+ Zamerne jiny nazev, aby v template bylo na vyber z x.perex, x.person.perex a x.pageperex
+ """
+ return self.perex or self.person.perex
+
def get_context(self, request):
context = super().get_context(request)
# Na strance detailu cloveka se vpravo zobrazuji 3 dalsi nahodne profily
diff --git a/shared/templates/shared/person_badge_snippet.html b/shared/templates/shared/person_badge_snippet.html
index 3f2ee662..961dc77f 100644
--- a/shared/templates/shared/person_badge_snippet.html
+++ b/shared/templates/shared/person_badge_snippet.html
@@ -2,31 +2,31 @@
<div class="badge ">
<a href="{{ person.url }}" class="avatar badge__avatar avatar--sm">
- <img src="{{ person.portrait }}" alt="{{ person.name }}" />
+ <img src="{{ person.person.portrait }}" alt="{{ person.person.name }}" />
</a>
<div class="badge__body">
<h2 class="head-heavy-xs badge__title">
- <a href="{{ person.url }}" title="{{ person.name }}" class="content-block--nostyle">
- {{ person.name }}
+ <a href="{{ person.url }}" title="{{ person.person.name }}" class="content-block--nostyle">
+ {{ person.person.name }}
</a>
</h2>
<p class="badge__occupation">
{% if title %}
{{ title }}
{% else %}
- {{ person.perex|linebreaksbr }}
+ {{ person.pageperex|linebreaksbr }}
{% endif %}
</p>
{% if not skipcontacts %}
- {% if person.phone %}
- <a href="tel:person.phone" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ {% if person.person.phone %}
+ <a href="tel:person.person.phone" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
<i class="ico--phone"></i>
- <span>{{ person.phone }}</span>
+ <span>{{ person.person.phone }}</span>
</a>
{% endif %}
- <a href="mailto:{{person.email}}" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
- <i class="ico--envelope"></i><span>{{person.email}}</span>
+ <a href="mailto:{{person.person.email}}" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ <i class="ico--envelope"></i><span>{{person.person.email}}</span>
</a>
{% endif %}
--
GitLab