hide other party when there is no party defined, minor fixes

district/models.py

@@ -125,15 +125,6 @@ class DistrictHomePage(CalendarMixin, MainHomePageMixin):
         "Text tlačítka kalendáře", max_length=256, default="Kalendář"
     )
 
-    gdpr_and_cookies_page = models.ForeignKey(
-        # Keep this a reference to the main website's GDPR page. Not ideal, but works (for now).
-        "main.MainSimplePage",
-        verbose_name="Stránka pro GDPR",
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True,
-    )
-
     # --- END New fields ---
 
     # Extra komentar v paticce
@@ -170,6 +161,10 @@ class DistrictHomePage(CalendarMixin, MainHomePageMixin):
 
     ### EDIT HANDLERS
 
+    settings_panels = [
+        FieldPanel("matomo_id"),
+    ]
+
     edit_handler = TabbedInterface(
         [
             ObjectList(MainHomePageMixin.content_panels, heading="Obsah"),
@@ -201,6 +196,12 @@ class DistrictHomePage(CalendarMixin, MainHomePageMixin):
     class Meta:
         verbose_name = "Oblastní sdružení"
 
+    @property
+    def gdpr_and_cookies_page(self):
+        from main.models import MainHomePage
+
+        return MainHomePage.objects.first().gdpr_and_cookies_page
+
     @property
     def articles_page_model(self):
         return DistrictArticlesPage

shared/models/main.py

@@ -1492,7 +1492,7 @@ class MainArticlePageMixin(
 
     ### BEGIN Panels
 
-    content_panels = [
+    content_panels = Page.content_panels + [
         FieldPanel("timestamp"),
         FieldPanel("perex"),
         FieldPanel("content"),

uniweb/blocks.py

@@ -74,7 +74,10 @@ class PersonContactBlock(StructBlock):
     position = CharBlock(label="Název pozice", required=False)
     person = PageChooserBlock(
         label="Osoba",
-        page_type=["uniweb.UniwebPersonPage"],
+        page_type=[
+            "uniweb.UniwebPersonPage",
+            "district.DistrictPersonPage",
+        ],
     )
 
     class Meta:

uniweb/models.py

@@ -205,6 +205,7 @@ class MenuItemBlock(blocks.StructBlock):
             "uniweb.UniwebPeoplePage",
             "uniweb.UniwebPersonPage",
             "uniweb.UniwebPdfPage",
+            "district.DistrictPersonPage",
         ],
     )