fix newsletter, newsletter blocks

district/models.py

@@ -6,9 +6,11 @@ from django.contrib import messages
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.conf import settings
 from django.http import HttpResponseRedirect
 from modelcluster.contrib.taggit import ClusterTaggableManager
 from modelcluster.fields import ParentalKey
+from wagtail.contrib.routable_page.models import RoutablePageMixin
 from taggit.models import TaggedItemBase
 from wagtail.admin.panels import (
     FieldPanel,
@@ -25,6 +27,8 @@ from wagtailmetadata.models import MetadataPageMixin
 
 from calendar_utils.models import CalendarMixin
 from maps_utils.blocks import MapPointBlock
+from shared.forms import SubscribeForm
+from wagtail.contrib.routable_page.models import route
 from maps_utils.const import (
     DEFAULT_MAP_STYLE,
     MAP_STYLES,

shared/models/main.py

@@ -30,7 +30,7 @@ from wagtail.blocks import PageChooserBlock, RichTextBlock
 from wagtail.contrib.routable_page.models import RoutablePageMixin, route
 from wagtail.documents.models import Document
 from wagtail.fields import RichTextField, StreamField
-from wagtail.models import Page
+from wagtail.models import Page, Site
 from wagtail.search import index
 from wagtailmetadata.models import MetadataPageMixin
 
@@ -1170,10 +1170,9 @@ class MainHomePageMixin(
                     form.cleaned_data["email"],
                     (
                         self.newsletter_list_id
-                        if hasattr(self, "newsletter_list_id")
-                        and self.newsletter_list_id
+                        if hasattr(self, "newsletter_list_id") and self.newsletter_list_id
                         else settings.PIRATICZ_NEWSLETTER_CID
-                    ),
+                    )
                 )
 
                 messages.success(