From 47fd3536fd1444156af6eade6e053d05eeaf4cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Sun, 20 Aug 2023 21:50:02 +0200
Subject: [PATCH] fix page routes
---
home/migrations/0033_merge_20230820_1844.py | 8 +++-----
home/models.py | 14 +++++++-------
institut/settings/base.py | 3 ---
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/home/migrations/0033_merge_20230820_1844.py b/home/migrations/0033_merge_20230820_1844.py
index e36499b..8b9e9a8 100644
--- a/home/migrations/0033_merge_20230820_1844.py
+++ b/home/migrations/0033_merge_20230820_1844.py
@@ -4,11 +4,9 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
- ('home', '0024_alter_homepage_academic_council_description_and_more'),
- ('home', '0032_alter_homevideopage_content'),
+ ("home", "0024_alter_homepage_academic_council_description_and_more"),
+ ("home", "0032_alter_homevideopage_content"),
]
- operations = [
- ]
+ operations = []
diff --git a/home/models.py b/home/models.py
index 4423dbb..80c57b4 100644
--- a/home/models.py
+++ b/home/models.py
@@ -261,7 +261,7 @@ class HomePage(RoutablePageMixin, Page):
# --- BEGIN Articles, events, videos and documents ---
-class HomeArticlesPage(RoutablePageMixin, Page):
+class HomeArticlesPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
@@ -293,7 +293,7 @@ class HomeArticlesPage(RoutablePageMixin, Page):
verbose_name = "Rozcestník článků"
-class HomeEventsPage(RoutablePageMixin, Page):
+class HomeEventsPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
@@ -311,7 +311,7 @@ class HomeEventsPage(RoutablePageMixin, Page):
verbose_name = "Rozcestník akcí"
-class HomeDocumentsPage(RoutablePageMixin, Page):
+class HomeDocumentsPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
@@ -329,7 +329,7 @@ class HomeDocumentsPage(RoutablePageMixin, Page):
verbose_name = "Rozcestník dokumentů"
-class HomeVideosPage(RoutablePageMixin, Page):
+class HomeVideosPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
@@ -347,7 +347,7 @@ class HomeVideosPage(RoutablePageMixin, Page):
verbose_name = "Rozcestník videí"
-class HomeContentPageMixin(RoutablePageMixin, Page):
+class HomeContentPageMixin(Page):
author_page = models.ForeignKey(
"home.HomePersonPage",
on_delete=models.SET_NULL,
@@ -527,7 +527,7 @@ class HomeVideoPage(HomeContentPageMixin):
# --- BEGIN People ---
-class HomePeoplePage(RoutablePageMixin, Page):
+class HomePeoplePage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
@@ -545,7 +545,7 @@ class HomePeoplePage(RoutablePageMixin, Page):
verbose_name = "Rozcestník osob"
-class HomePersonPage(RoutablePageMixin, Page):
+class HomePersonPage(Page):
image = models.ForeignKey(
"wagtailimages.Image",
null=True,
diff --git a/institut/settings/base.py b/institut/settings/base.py
index a397fdd..7330ad8 100644
--- a/institut/settings/base.py
+++ b/institut/settings/base.py
@@ -176,6 +176,3 @@ WAGTAILSEARCH_BACKENDS = {
# Base URL to use when referring to full URLs within the Wagtail admin backend -
# e.g. in notification emails. Don't include '/admin' or a trailing slash
WAGTAILADMIN_BASE_URL = "http://example.com"
-
-WAGTAIL_APPEND_SLASH = True
-APPEND_SLASH = True
--
GitLab