Skip to content
Snippets Groups Projects
Commit b4fdc7ea authored by Tomi Valentová's avatar Tomi Valentová
Browse files

fix meta titles

parent cf54c60a
No related branches found
No related tags found
2 merge requests!1061Fix meta titles,!1060Fix meta titles
Pipeline #19073 passed
...@@ -538,17 +538,6 @@ class DistrictCenterPage( ...@@ -538,17 +538,6 @@ class DistrictCenterPage(
class Meta: class Meta:
verbose_name = "Stránka pirátského centra" verbose_name = "Stránka pirátského centra"
def get_background_photo(self):
"""
Vrací background_photo pro pozadí na stránce, pokud není nastaveno,
vezme falbback z homepage
"""
return (
self.background_photo
if self.background_photo
else self.root_page.fallback_image
)
@property @property
def has_calendar(self): def has_calendar(self):
return self.calendar_id is not None return self.calendar_id is not None
......
...@@ -93,8 +93,8 @@ class ExtendedMetadataHomePageMixin(models.Model): ...@@ -93,8 +93,8 @@ class ExtendedMetadataHomePageMixin(models.Model):
abstract = True abstract = True
def get_meta_title_suffix(self): def get_meta_title_suffix(self):
if self.meta_title_suffix: if self.root_page.meta_title_suffix:
return self.meta_title_suffix return self.root_page.meta_title_suffix
if hasattr(super(), "get_meta_title"): if hasattr(super(), "get_meta_title"):
return super().get_meta_title() return super().get_meta_title()
...@@ -102,15 +102,11 @@ class ExtendedMetadataHomePageMixin(models.Model): ...@@ -102,15 +102,11 @@ class ExtendedMetadataHomePageMixin(models.Model):
return self.get_site().site_name return self.get_site().site_name
def get_meta_title(self): def get_meta_title(self):
title = super().get_meta_title() """
suffix = self.get_meta_title_suffix() Return only the meta suffix on homepages.
"""
# Covers scenario when title_suffix is not set and evaluates to super().get_meta_title() value.
# Rather than having MS Pardubice | MS Pardubice, just use MS Pardubice alone.
if title != suffix:
return f"{super().get_meta_title()} | {self.get_meta_title_suffix()}"
return title return self.get_meta_title_suffix()
class ExtendedMetadataPageMixin(models.Model): class ExtendedMetadataPageMixin(models.Model):
...@@ -127,35 +123,24 @@ class ExtendedMetadataPageMixin(models.Model): ...@@ -127,35 +123,24 @@ class ExtendedMetadataPageMixin(models.Model):
abstract = True abstract = True
def get_meta_title_suffix(self): def get_meta_title_suffix(self):
if not hasattr(self, "root_page"): if self.root_page.meta_title_suffix:
logger.warning( return self.root_page.meta_title_suffix
"Using `ExtendedMetadataPageMixin` without `SubpageMixin` for %s",
repr(self),
)
return None
if not hasattr(self.root_page, "get_meta_title_suffix"): if hasattr(super(), "get_meta_title"):
logger.warning( return super().get_meta_title()
"Using `ExtendedMetadataPageMixin` without `ExtendedMetadataHomePageMixin` on the root page for %s",
repr(self),
)
return None
return self.root_page.get_meta_title_suffix() return self.get_site().site_name
def get_meta_title(self): def get_meta_title(self):
title = super().get_meta_title() title = super().get_meta_title()
suffix = self.get_meta_title_suffix() suffix = self.get_meta_title_suffix()
if hasattr(self, "root_page") and title == self.root_page.title:
return f"Domů | Piráti {suffix}"
# Covers scenario when title_suffix is not set and evaluates to super().get_meta_title() value. # Covers scenario when title_suffix is not set and evaluates to super().get_meta_title() value.
# Rather than having MS Pardubice | MS Pardubice, just use MS Pardubice alone. # Rather than having MS Pardubice | MS Pardubice, just use MS Pardubice alone.
if title != suffix: if title != suffix:
return f"{super().get_meta_title()} | Piráti {self.get_meta_title_suffix()}" return f"{super().get_meta_title()} | {self.get_meta_title_suffix()}"
return f"Piráti {title}" return title
class SubpageMixin: class SubpageMixin:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment