diff --git a/home/migrations/0033_merge_20230820_1844.py b/home/migrations/0033_merge_20230820_1844.py index e36499b1a14ea1212f192671599fe533f726eb02..8b9e9a8f3c8be5d3ccd7b28e9c2a98b1f42a2e54 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 4423dbb744894fb146cefd9417cac1d0cb6105f8..80c57b405821f9dc2ab41906c4a26075575b01b2 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 a397fdd5a01b3a18fc77dcb03782eeb619eb0dea..7330ad8c0a96fe5a050dec7f09e62ac45f291e12 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