From 41cd99b0b038d21d24e79e3d3bc7c882d65ee2dd Mon Sep 17 00:00:00 2001 From: Erik Stein Date: Wed, 20 Feb 2019 10:05:49 +0100 Subject: [PATCH] PageTitlesFunctionMixin: __str__ without HTML. --- CHANGES | 3 +++ shared/utils/models/pages.py | 12 ++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 789d51f..442a649 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +0.2.22 2019-02-20 +- PageTitlesFunctionMixin: __str__ without HTML. + 0.2.21 2019-02-19 - Mock datetime for preview. - Class based daterange views. diff --git a/shared/utils/models/pages.py b/shared/utils/models/pages.py index 28ec5b9..13e1ab5 100644 --- a/shared/utils/models/pages.py +++ b/shared/utils/models/pages.py @@ -35,9 +35,10 @@ else: # TODO Leave window_title alone, do not slimdown +@python_2_unicode_compatible class PageTitlesFunctionMixin(object): def __str__(self): - return strip_tags(slimdown(self.get_short_title())) + return strip_tags(self.get_short_title()) def get_title(self): return slimdown(firstof( @@ -76,9 +77,7 @@ class PageTitlesFunctionMixin(object): ) -# TODO Use translatable fields by default -@python_2_unicode_compatible -class PageTitlesMixin(models.Model, PageTitlesFunctionMixin): +class PageTitlesMixin(PageTitlesFunctionMixin, models.Model): """ A model mixin containg title and slug field for models serving as website pages with an URL. @@ -98,13 +97,10 @@ class PageTitlesMixin(models.Model, PageTitlesFunctionMixin): class Meta: abstract = True - def __str__(self): - return self.name - # FIXME short_title is deprecated @property def short_title(self): - return self.name + return self.get_short_title() @short_title.setter def short_title(self, value):