From 1bbf21c0bb934f78cf68c01e65a4b781179b5659 Mon Sep 17 00:00:00 2001
From: Jarmil <jarmil.halamicek@seznam.cz>
Date: Thu, 7 Jan 2021 11:37:21 +0100
Subject: [PATCH] WIP: Oprava modelu PersonPage, aby zahrnoval Person
---
shared/migrations/0019_personpage_person.py | 23 +++++++++++++++++++++
shared/models.py | 7 +++++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 shared/migrations/0019_personpage_person.py
diff --git a/shared/migrations/0019_personpage_person.py b/shared/migrations/0019_personpage_person.py
new file mode 100644
index 00000000..56781183
--- /dev/null
+++ b/shared/migrations/0019_personpage_person.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.3 on 2021-01-07 10:30
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("shared", "0018_auto_20210107_1101"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="personpage",
+ name="person",
+ field=models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.PROTECT,
+ to="shared.person",
+ ),
+ ),
+ ]
diff --git a/shared/models.py b/shared/models.py
index f239da83..80549861 100644
--- a/shared/models.py
+++ b/shared/models.py
@@ -154,6 +154,9 @@ class Person(models.Model):
def facebook(self):
return None # TODO
+ def __str__(self):
+ return self.username
+
class Meta:
verbose_name_plural = "Piráti"
verbose_name = "Pirát"
@@ -162,11 +165,11 @@ class Person(models.Model):
class PersonPage(SharedSubpageMixin, MetadataPageMixin, Page):
"""Stranka Pirata v kontextu jednoho webu"""
- # person = models.ForeignKey(Person, on_delete=models.PROTECT)
+ person = models.ForeignKey(Person, on_delete=models.PROTECT, null=True)
perex = models.TextField("Perex osoby", blank=True)
content_panels = Page.content_panels + [
- # FieldPanel("person"),
+ FieldPanel("person"),
FieldPanel("perex"),
]
--
GitLab