X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/481ffee4654c93c88c3726994e7e3acf7213c59b..4294efcad168429838c93eb3626b60bfe9a6db68:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 6550f8a..9f1b61b 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -37,6 +37,7 @@ class BlogEntry(Entity, Titled):
 	class Meta:
 		ordering = ['-date']
 		verbose_name_plural = "blog entries"
+		get_latest_by = "date"
 
 
 register_value_model(BlogEntry)
@@ -104,7 +105,12 @@ class BlogView(MultiView, FeedMultiViewMixin):
 	def urlpatterns(self):
 		urlpatterns = patterns('',
 			url(r'^', include(self.feed_patterns(self.get_all_entries, self.index_page, 'index'))),
-			url(r'^%s/(?P<tag_slugs>[-\w]+[-+/\w]*)/%s/' % (self.tag_permalink_base, self.feed_suffix), self.feed_view(self.get_entries_by_tag, 'entries_by_tag_feed'), name='entries_by_tag_feed'),
+		)
+		if self.feeds_enabled:
+			urlpatterns += patterns('',
+				url(r'^%s/(?P<tag_slugs>[-\w]+[-+/\w]*)/%s/' % (self.tag_permalink_base, self.feed_suffix), self.feed_view(self.get_entries_by_tag, 'entries_by_tag_feed'), name='entries_by_tag_feed'),
+			)
+		urlpatterns += patterns('',
 			url(r'^%s/(?P<tag_slugs>[-\w]+[-+/\w]*)/' % self.tag_permalink_base, self.page_view(self.get_entries_by_tag, self.tag_page), name='entries_by_tag')
 		)
 		if self.tag_archive_page:
@@ -191,7 +197,7 @@ class BlogView(MultiView, FeedMultiViewMixin):
 	def add_item(self, feed, obj, kwargs=None):
 		defaults = {
 			'title': obj.title,
-			'description': obj.excerpt or obj.content,
+			'description': obj.content,
 			'author_name': obj.author.get_full_name(),
 			'pubdate': obj.date
 		}
@@ -387,7 +393,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 +409,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 {})
@@ -423,7 +429,7 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 			'title': obj.title,
 			'author_name': ', '.join([author.get_full_name() for author in obj.authors.all()]),
 			'pubdate': obj.date,
-			'description': obj.lede or obj.full_text,
+			'description': obj.full_text,
 			'categories': [tag.name for tag in obj.tags.all()]
 		}
 		defaults.update(kwargs or {})
@@ -436,4 +442,4 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 			'title': title
 		}
 		defaults.update(kwargs or {})
-		return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults)
\ No newline at end of file
+		return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults)