From fac3c08a5d1fdff8d2870e68e3868cd65b81f38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Wed, 12 Jun 2024 16:49:23 +0200
Subject: [PATCH] minor bugfixes
---
..._districthomepage_gdpr_and_cookies_page.py | 17 +++++++++++
...districtpeoplepage_perex_col_1_and_more.py | 28 +++++++++++++++++++
...ter_mainpeoplepage_perex_col_1_and_more.py | 28 +++++++++++++++++++
shared/models/main.py | 21 ++++++++++++--
.../candidates/candidate_secondary_box.html | 2 +-
.../header/district/person_header.html | 2 +-
shared/templates/styleguide2/person_page.html | 8 ++++--
..._alter_uniwebhomepage_top_menu_and_more.py | 25 +++++++++++++++++
8 files changed, 124 insertions(+), 7 deletions(-)
create mode 100644 district/migrations/0223_remove_districthomepage_gdpr_and_cookies_page.py
create mode 100644 district/migrations/0224_alter_districtpeoplepage_perex_col_1_and_more.py
create mode 100644 main/migrations/0095_alter_mainpeoplepage_perex_col_1_and_more.py
create mode 100644 uniweb/migrations/0064_alter_uniwebhomepage_top_menu_and_more.py
diff --git a/district/migrations/0223_remove_districthomepage_gdpr_and_cookies_page.py b/district/migrations/0223_remove_districthomepage_gdpr_and_cookies_page.py
new file mode 100644
index 00000000..831ad411
--- /dev/null
+++ b/district/migrations/0223_remove_districthomepage_gdpr_and_cookies_page.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.6 on 2024-06-12 14:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('district', '0222_districtsearchpage'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='districthomepage',
+ name='gdpr_and_cookies_page',
+ ),
+ ]
diff --git a/district/migrations/0224_alter_districtpeoplepage_perex_col_1_and_more.py b/district/migrations/0224_alter_districtpeoplepage_perex_col_1_and_more.py
new file mode 100644
index 00000000..d7f53794
--- /dev/null
+++ b/district/migrations/0224_alter_districtpeoplepage_perex_col_1_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.0.6 on 2024-06-12 14:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('district', '0223_remove_districthomepage_gdpr_and_cookies_page'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='districtpeoplepage',
+ name='perex_col_1',
+ field=models.TextField(blank=True, null=True, verbose_name='Perex - první sloupec'),
+ ),
+ migrations.AlterField(
+ model_name='districtpeoplepage',
+ name='perex_col_2',
+ field=models.TextField(blank=True, null=True, verbose_name='Perex - druhý sloupec'),
+ ),
+ migrations.AlterField(
+ model_name='districtpersonpage',
+ name='perex',
+ field=models.TextField(blank=True, null=True),
+ ),
+ ]
diff --git a/main/migrations/0095_alter_mainpeoplepage_perex_col_1_and_more.py b/main/migrations/0095_alter_mainpeoplepage_perex_col_1_and_more.py
new file mode 100644
index 00000000..04538558
--- /dev/null
+++ b/main/migrations/0095_alter_mainpeoplepage_perex_col_1_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.0.6 on 2024-06-12 14:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main', '0094_alter_mainprogrampage_program'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='mainpeoplepage',
+ name='perex_col_1',
+ field=models.TextField(blank=True, null=True, verbose_name='Perex - první sloupec'),
+ ),
+ migrations.AlterField(
+ model_name='mainpeoplepage',
+ name='perex_col_2',
+ field=models.TextField(blank=True, null=True, verbose_name='Perex - druhý sloupec'),
+ ),
+ migrations.AlterField(
+ model_name='mainpersonpage',
+ name='perex',
+ field=models.TextField(blank=True, null=True),
+ ),
+ ]
diff --git a/shared/models/main.py b/shared/models/main.py
index e74103ef..6ae191df 100644
--- a/shared/models/main.py
+++ b/shared/models/main.py
@@ -251,6 +251,9 @@ class PageInMenuMixin(Page):
for menu in menu_iterator:
if menu.block_type == "menu_item":
+ if menu.value["link"].strip() == instance.full_url.strip():
+ return menu.value["title"]
+
if menu.value["page"] is None:
continue
@@ -258,6 +261,9 @@ class PageInMenuMixin(Page):
return menu.value["title"]
elif menu.block_type == "menu_parent":
for item in menu.value["menu_items"]:
+ if item.value["link"].strip() == instance.full_url.strip():
+ return item.value["title"]
+
if item["page"] is None:
continue
@@ -1745,9 +1751,13 @@ class MainPeoplePageMixin(
perex_col_1 = models.TextField(
verbose_name="Perex - první sloupec",
+ blank=True,
+ null=True,
)
perex_col_2 = models.TextField(
verbose_name="Perex - druhý sloupec",
+ blank=True,
+ null=True,
)
### PANELS
@@ -1772,7 +1782,11 @@ class MainPeoplePageMixin(
@property
def perex(self) -> str:
- return self.perex_col_1 + " \n" + self.perex_col_2
+ return (
+ (self.perex_col_1 if self.perex_col_1 is not None else "")
+ + " \n"
+ + (self.perex_col_2 if self.perex_col_2 is not None else "")
+ )
class Meta:
verbose_name = "Lidé a týmy"
@@ -1821,7 +1835,10 @@ class MainPersonPageMixin(
blank=True,
null=True,
)
- perex = models.TextField()
+ perex = models.TextField(
+ blank=True,
+ null=True
+ )
text = RichTextField()
social_links = StreamField(
diff --git a/shared/templates/styleguide2/includes/molecules/candidates/candidate_secondary_box.html b/shared/templates/styleguide2/includes/molecules/candidates/candidate_secondary_box.html
index 4fccd7f0..6f36abb5 100644
--- a/shared/templates/styleguide2/includes/molecules/candidates/candidate_secondary_box.html
+++ b/shared/templates/styleguide2/includes/molecules/candidates/candidate_secondary_box.html
@@ -43,7 +43,7 @@
<div>
Pirátská Strana
</div>
- {% else %}
+ {% elif self.page.other_party %}
{% image self.page.other_party_logo fill-150x150 as other_party_logo_image %}
<img
diff --git a/shared/templates/styleguide2/includes/organisms/header/district/person_header.html b/shared/templates/styleguide2/includes/organisms/header/district/person_header.html
index 47802e81..e7f8f3c2 100644
--- a/shared/templates/styleguide2/includes/organisms/header/district/person_header.html
+++ b/shared/templates/styleguide2/includes/organisms/header/district/person_header.html
@@ -19,7 +19,7 @@
Člen(ka) Pirátské strany
</div>
- {% else %}
+ {% elif other_party_name %}
{% image other_party_image_source max-200x200 as other_party_image %}
<div class="flex gap-3 items-center">
diff --git a/shared/templates/styleguide2/person_page.html b/shared/templates/styleguide2/person_page.html
index b51779f2..65412f6c 100644
--- a/shared/templates/styleguide2/person_page.html
+++ b/shared/templates/styleguide2/person_page.html
@@ -22,9 +22,11 @@
"
>
<div class="prose [&_p]:leading-7 [&_p]:text-black [&_p]:text-lg" style="max-width:100ch">
- <p class="mb-4">
- {{ page.perex }}
- </p>
+ {% if page.perex %}
+ <p class="mb-4">
+ {{ page.perex }}
+ </p>
+ {% endif %}
{{ page.text|richtext }}
</div>
diff --git a/uniweb/migrations/0064_alter_uniwebhomepage_top_menu_and_more.py b/uniweb/migrations/0064_alter_uniwebhomepage_top_menu_and_more.py
new file mode 100644
index 00000000..75533221
--- /dev/null
+++ b/uniweb/migrations/0064_alter_uniwebhomepage_top_menu_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 5.0.6 on 2024-06-12 14:12
+
+import wagtail.blocks
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uniweb', '0063_alter_uniwebcalendarpage_calendar_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='uniwebhomepage',
+ name='top_menu',
+ field=wagtail.fields.StreamField([('item', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock(label='název')), ('page', wagtail.blocks.PageChooserBlock(label='stránka', page_type=['uniweb.UniwebHomePage', 'uniweb.UniwebFlexiblePage', 'uniweb.UniwebArticlesIndexPage', 'uniweb.UniwebFormPage', 'uniweb.UniwebPeoplePage', 'uniweb.UniwebPersonPage', 'uniweb.UniwebPdfPage', 'district.DistrictPersonPage']))]))], blank=True, verbose_name='horní menu'),
+ ),
+ migrations.AlterField(
+ model_name='uniwebpeoplepage',
+ name='content',
+ field=wagtail.fields.StreamField([('text', wagtail.blocks.RichTextBlock(features=['h2', 'h3', 'h4', 'h5', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'superscript', 'subscript', 'strikethrough', 'blockquote', 'embed'], label='Textový editor')), ('people_group', wagtail.blocks.StructBlock([('group_title', wagtail.blocks.CharBlock(label='Titulek', required=True)), ('person_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('position', wagtail.blocks.CharBlock(label='Název pozice', required=False)), ('person', wagtail.blocks.PageChooserBlock(label='Osoba', page_type=['uniweb.UniwebPersonPage', 'district.DistrictPersonPage']))]), label='List osob'))]))], blank=True, verbose_name='Obsah stránky'),
+ ),
+ ]
--
GitLab