X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/a8ca5f4d7033f91afa24acbcd015f24350ea0d26..954c1ed70e4dd2181d697c23de778756e5dd3e19:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 940f7e7..62d8d2a 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -117,7 +117,8 @@ 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]*)/' % self.tag_permalink_base), include(self.feed_patterns(self.get_entries_by_tag, self.tag_page, 'entries_by_tag')))
+			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'),
+			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:
 			urlpatterns += patterns('',
@@ -178,7 +179,7 @@ class BlogView(MultiView, FeedMultiViewMixin):
 		context.update({'year': year, 'month': month, 'day': day})
 		return entries, context
 	
-	def get_entries_by_tag(self, request, node=None, extra_context=None):
+	def get_entries_by_tag(self, request, tag_slugs, node=None, extra_context=None):
 		tags = []
 		for tag_slug in tag_slugs.replace('+', '/').split('/'):
 			if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /)
@@ -193,10 +194,12 @@ class BlogView(MultiView, FeedMultiViewMixin):
 		entries = self.blog.entries.all()
 		for tag in tags:
 			entries = entries.filter(tags=tag)
-		if entries.count() <= 0:
-			raise Http404
 		
-		return entries, extra_context
+		context = self.get_context()
+		context.update(extra_context or {})
+		context.update({'tags': tags})
+		
+		return entries, context
 	
 	def get_obj_description(self, obj):
 		return obj.excerpt