X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/1dba84d30c4323acb722de2011ff7a0bff9148aa..2f90757a89424650440d684e08cbf53d98cec8fd:/contrib/penfield/models.py diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py index 6da87a6..8248340 100644 --- a/contrib/penfield/models.py +++ b/contrib/penfield/models.py @@ -387,7 +387,7 @@ class NewsletterView(MultiView, FeedMultiViewMixin): def get_articles_by_issue(self, request, numbering, extra_context=None): try: issue = self.newsletter.issues.get(numbering=numbering) - except: + except NewsletterIssue.DoesNotExist: raise Http404 context = extra_context or {} context.update({'issue': issue}) @@ -403,7 +403,7 @@ class NewsletterView(MultiView, FeedMultiViewMixin): articles = articles.filter(date__day=day) try: article = articles.get(slug=slug) - except: + except NewsletterArticle.DoesNotExist: raise Http404 context = self.get_context() context.update(extra_context or {}) @@ -421,7 +421,7 @@ class NewsletterView(MultiView, FeedMultiViewMixin): def add_item(self, feed, obj, kwargs=None): defaults = { 'title': obj.title, - 'author_name': ', '.join(obj.authors), + 'author_name': ', '.join([author.get_full_name() for author in obj.authors.all()]), 'pubdate': obj.date, 'description': obj.lede or obj.full_text, 'categories': [tag.name for tag in obj.tags.all()]