From 209b4bf2cdd7625650bba14525af6b36dbdf46e1 Mon Sep 17 00:00:00 2001
From: "jindra12.underdark" <jindra12.underdark@gmail.com>
Date: Sat, 15 Apr 2023 01:21:38 +0200
Subject: [PATCH] Revert changes due to PR suggestions
#163
---
...elections2021calendarpage_calendar_page.py | 25 -------------------
elections2021/models.py | 10 ++------
senat_campaign/models.py | 10 +-------
.../senat_campaign_calendar_page.html | 10 --------
4 files changed, 3 insertions(+), 52 deletions(-)
delete mode 100644 elections2021/migrations/0054_elections2021calendarpage_calendar_page.py
delete mode 100644 senat_campaign/templates/senat_campaign/senat_campaign_calendar_page.html
diff --git a/elections2021/migrations/0054_elections2021calendarpage_calendar_page.py b/elections2021/migrations/0054_elections2021calendarpage_calendar_page.py
deleted file mode 100644
index 734f00d3..00000000
--- a/elections2021/migrations/0054_elections2021calendarpage_calendar_page.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated by Django 4.1.6 on 2023-04-13 21:12
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("calendar_utils", "0005_calendarpage"),
- ("elections2021", "0053_alter_elections2021articletag_content_object"),
- ]
-
- operations = [
- migrations.AddField(
- model_name="elections2021calendarpage",
- name="calendar_page",
- field=models.ForeignKey(
- blank=True,
- null=True,
- on_delete=django.db.models.deletion.PROTECT,
- to="calendar_utils.calendarpage",
- verbose_name="Stránka s kalendářem",
- ),
- ),
- ]
diff --git a/elections2021/models.py b/elections2021/models.py
index fe54fe96..cd452b16 100644
--- a/elections2021/models.py
+++ b/elections2021/models.py
@@ -2578,13 +2578,7 @@ class Elections2021CalendarPage(SubpageMixin, MetadataPageMixin, CalendarMixin,
content_panels = Page.content_panels + [
FieldPanel("photo"),
- MultiFieldPanel(
- [
- FieldPanel("calendar_url"),
- PageChooserPanel("calendar_page"),
- ],
- "Kalendář",
- ),
+ FieldPanel("calendar_url"),
]
promote_panels = [
@@ -2608,7 +2602,7 @@ class Elections2021CalendarPage(SubpageMixin, MetadataPageMixin, CalendarMixin,
### RELATIONS
parent_page_types = ["elections2021.Elections2021HomePage"]
- subpage_types = ["calendar_utils.CalendarPage"]
+ subpage_types = []
### OTHERS
diff --git a/senat_campaign/models.py b/senat_campaign/models.py
index d45a1547..7b68f070 100644
--- a/senat_campaign/models.py
+++ b/senat_campaign/models.py
@@ -7,7 +7,6 @@ from wagtail.admin.panels import (
FieldPanel,
HelpPanel,
MultiFieldPanel,
- PageChooserPanel,
PublishingPanel,
)
from wagtail.documents.blocks import DocumentChooserBlock
@@ -184,13 +183,7 @@ class SenatCampaignHomePage(
],
heading="Sociální sítě",
),
- MultiFieldPanel(
- [
- FieldPanel("calendar_url"),
- PageChooserPanel("calendar_page"),
- ],
- "Kalendář",
- ),
+ FieldPanel("calendar_url"),
FieldPanel("donations_url"),
FieldPanel("matomo_id"),
FieldPanel("title_suffix"),
@@ -204,7 +197,6 @@ class SenatCampaignHomePage(
"senat_campaign.SenatCampaignNewsIndexPage",
"senat_campaign.SenatCampaignProgramPage",
"senat_campaign.SenatCampaignCookiesPage",
- "calendar_utils.CalendarPage",
]
### OTHERS
diff --git a/senat_campaign/templates/senat_campaign/senat_campaign_calendar_page.html b/senat_campaign/templates/senat_campaign/senat_campaign_calendar_page.html
deleted file mode 100644
index f3f30da8..00000000
--- a/senat_campaign/templates/senat_campaign/senat_campaign_calendar_page.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "senat_campaign/base.html" %}
-{% load wagtailcore_tags %}
-
-{% block content %}
-<main>
- <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
- {% include "shared/calendar_current_events_snippet.html" with fullscreen=True %}
- </section>
-</main>
-{% endblock %}
--
GitLab