diff --git a/district/models.py b/district/models.py index e0f5061c3b19df79392f34d3396eaa2facc67bf3..8e4b3951fdb044ef017dd169ebdcdf37a1b80b9a 100644 --- a/district/models.py +++ b/district/models.py @@ -538,17 +538,6 @@ class DistrictCenterPage( class Meta: 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 def has_calendar(self): return self.calendar_id is not None diff --git a/shared/models/main.py b/shared/models/main.py index 07b61bd0fc827b16dde39b170e045da1f29a4210..bd3128947bb1747f065639c54404b595d723616b 100644 --- a/shared/models/main.py +++ b/shared/models/main.py @@ -93,8 +93,8 @@ class ExtendedMetadataHomePageMixin(models.Model): abstract = True def get_meta_title_suffix(self): - if self.meta_title_suffix: - return self.meta_title_suffix + if self.root_page.meta_title_suffix: + return self.root_page.meta_title_suffix if hasattr(super(), "get_meta_title"): return super().get_meta_title() @@ -102,15 +102,11 @@ class ExtendedMetadataHomePageMixin(models.Model): return self.get_site().site_name def get_meta_title(self): - title = super().get_meta_title() - suffix = self.get_meta_title_suffix() - - # 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 only the meta suffix on homepages. + """ - return title + return self.get_meta_title_suffix() class ExtendedMetadataPageMixin(models.Model): @@ -127,35 +123,24 @@ class ExtendedMetadataPageMixin(models.Model): abstract = True def get_meta_title_suffix(self): - if not hasattr(self, "root_page"): - logger.warning( - "Using `ExtendedMetadataPageMixin` without `SubpageMixin` for %s", - repr(self), - ) - return None + if self.root_page.meta_title_suffix: + return self.root_page.meta_title_suffix - if not hasattr(self.root_page, "get_meta_title_suffix"): - logger.warning( - "Using `ExtendedMetadataPageMixin` without `ExtendedMetadataHomePageMixin` on the root page for %s", - repr(self), - ) - return None + if hasattr(super(), "get_meta_title"): + return super().get_meta_title() - return self.root_page.get_meta_title_suffix() + return self.get_site().site_name def get_meta_title(self): title = super().get_meta_title() 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. # Rather than having MS Pardubice | MS Pardubice, just use MS Pardubice alone. 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: