diff --git a/example/settings.py b/example/settings.py index 65d8277..67c1882 100755 --- a/example/settings.py +++ b/example/settings.py @@ -90,7 +90,7 @@ ) VIEWPOINT_SETTINGS = { 'BLOG_RELATION_MODELS': ('flatpages.flatpage',), - 'DEFAULT_BLOG': 'default', + # 'DEFAULT_BLOG': 'default', # 'USE_APPROVAL': True, # 'USE_CATEGORIES': True, # 'DEFAULT_STORAGE' = 'media_storage.MediaStorage' diff --git a/viewpoint/__init__.py b/viewpoint/__init__.py index 31476b1..30ec1fc 100644 --- a/viewpoint/__init__.py +++ b/viewpoint/__init__.py @@ -1,7 +1,7 @@ __version_info__ = { 'major': 0, 'minor': 9, - 'micro': 2, + 'micro': 3, 'releaselevel': 'final', 'serial': 1 } diff --git a/viewpoint/models.py b/viewpoint/models.py index 6835528..8dd528e 100644 --- a/viewpoint/models.py +++ b/viewpoint/models.py @@ -140,6 +140,18 @@ def get_absolute_url(self): else: return ('viewpoint_blog_detail', None, {'blog_slug': self.slug}) + @property + def owners_list(self): + """ + Print out the owners in a nice list + """ + owner_list = [unicode(o) for o in self.owners.all()] + + if len(owner_list) > 1: + return "%s and %s" % (", ".join(owner_list[:-1]), owner_list[-1]) + else: + return owner_list[0] + class Meta: ordering = ('title',) get_latest_by = 'creation_date' diff --git a/viewpoint/templates/viewpoint/blog_detail.html b/viewpoint/templates/viewpoint/blog_detail.html index 2f601ae..1f9cc68 100644 --- a/viewpoint/templates/viewpoint/blog_detail.html +++ b/viewpoint/templates/viewpoint/blog_detail.html @@ -3,7 +3,7 @@

{{ object.title }}

{{ object.description }}

Entries

- +

Owners: {{ object.owners_list}}