From f05a24c1677db642e9b767f1ee52ecd33ff9347b Mon Sep 17 00:00:00 2001
From: Jarmil <jarmil.halamicek@seznam.cz>
Date: Wed, 14 Oct 2020 12:57:24 +0200
Subject: [PATCH] Reorganizace strankek MS: detaily lidi pod stranku lide
---
district/models.py | 1 -
shared/models.py | 8 +++++---
shared/templates/shared/_person_badge.html | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/district/models.py b/district/models.py
index c4636ba5..d30cf51e 100644
--- a/district/models.py
+++ b/district/models.py
@@ -105,7 +105,6 @@ class DistrictHomePage(MetadataPageMixin, Page):
### RELATIONS
subpage_types = [
"shared.Article",
- "shared.PersonPage",
"shared.PeoplePage",
"DistrictArticles",
]
diff --git a/shared/models.py b/shared/models.py
index e848a3e3..8a976821 100644
--- a/shared/models.py
+++ b/shared/models.py
@@ -121,12 +121,14 @@ class PeoplePage(MetadataPageMixin, Page):
settings_panels = []
+ subpage_types = [
+ "shared.PersonPage",
+ ]
+
class Meta:
verbose_name = "Stránka Lidé"
def get_context(self, request):
context = super().get_context(request)
- context["people"] = (
- self.get_siblings(inclusive=False).type(PersonPage).live().specific()
- )
+ context["people"] = self.get_children().live().specific()
return context
diff --git a/shared/templates/shared/_person_badge.html b/shared/templates/shared/_person_badge.html
index 0063df4b..3f2ee662 100644
--- a/shared/templates/shared/_person_badge.html
+++ b/shared/templates/shared/_person_badge.html
@@ -1,13 +1,13 @@
<div class="badge ">
- <a href="/{{ person.slug }}" class="avatar badge__avatar avatar--sm">
+ <a href="{{ person.url }}" class="avatar badge__avatar avatar--sm">
<img src="{{ person.portrait }}" alt="{{ person.name }}" />
</a>
<div class="badge__body">
<h2 class="head-heavy-xs badge__title">
- <a href="/{{person.slug}}" title="{{ person.name }}" class="content-block--nostyle">
+ <a href="{{ person.url }}" title="{{ person.name }}" class="content-block--nostyle">
{{ person.name }}
</a>
</h2>
--
GitLab