ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/0.8.x' into develop

Browse source
This commit is contained in:
Iacopo Spalletti 2017-06-10 19:59:56 +02:00
commit 13ec4dff29
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
HISTORY.rst
View file

@ -22,6 +22,14 @@ History
* Improved admin filtering. * Improved admin filtering.
* Added featured date to post. * Added featured date to post.
*******************
0.8.13 (unreleased)
*******************
* Drop python 2.6 compatibility
* Fixed exceptions in __str__
* Drop python 2.6 compatibility
******************* *******************
0.8.12 (2017-03-11) 0.8.12 (2017-03-11)
******************* *******************

4
djangocms_blog/models.py
View file

@ -118,7 +118,7 @@ class BlogCategory(TranslatableModel):
) )
def __str__(self): def __str__(self):
return self.safe_translation_getter('name') return self.safe_translation_getter('name', any_language=True)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
super(BlogCategory, self).save(*args, **kwargs) super(BlogCategory, self).save(*args, **kwargs)
@ -226,7 +226,7 @@ class Post(KnockerModel, ModelMeta, TranslatableModel):
get_latest_by = 'date_published' get_latest_by = 'date_published'
def __str__(self): def __str__(self):
return self.safe_translation_getter('title') return self.safe_translation_getter('title', any_language=True)
@property @property
def guid(self, language=None): def guid(self, language=None):