X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/2628ac11201c749bbd3aea23597af8238b3a3e5a..353614c3d8e5af2872d2d0ef0c494e36548f6370:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 3cbff52..57e6ae3 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -10,6 +10,7 @@ from philo.utils import paginate
 from philo.contrib.penfield.validators import validate_pagination_count
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
 from philo.contrib.penfield.utils import FeedMultiViewMixin
+from philo.contrib.penfield.embed import *
 
 
 class Blog(Entity, Titled):
@@ -75,10 +76,6 @@ class BlogView(MultiView, FeedMultiViewMixin):
 	def per_page(self):
 		return self.entries_per_page
 	
-	@property
-	def feed_title(self):
-		return self.blog.title
-	
 	def get_subpath(self, obj):
 		if isinstance(obj, BlogEntry):
 			if obj.blog == self.blog:
@@ -211,6 +208,19 @@ class BlogView(MultiView, FeedMultiViewMixin):
 		defaults.update(kwargs or {})
 		super(BlogView, self).add_item(feed, obj, defaults)
 	
+	def get_feed(self, feed_type, extra_context, kwargs=None):
+		tags = (extra_context or {}).get('tags', None)
+		title = self.blog.title
+		
+		if tags is not None:
+			title += " - %s" % ', '.join([tag.name for tag in tags])
+		
+		defaults = {
+			'title': title
+		}
+		defaults.update(kwargs or {})
+		return super(BlogView, self).get_feed(feed_type, extra_context, defaults)
+	
 	def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None):
 		entries = self.blog.entries.all()
 		if year:
@@ -301,10 +311,6 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 	def __unicode__(self):
 		return self.newsletter.__unicode__()
 	
-	@property
-	def feed_title(self):
-		return self.newsletter.title
-	
 	def get_subpath(self, obj):
 		if isinstance(obj, NewsletterArticle):
 			if obj.newsletter == self.newsletter:
@@ -424,4 +430,13 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
 			'categories': [tag.name for tag in obj.tags.all()]
 		}
 		defaults.update(kwargs or {})
-		super(NewsletterView, self).add_item(feed, obj, defaults)
\ No newline at end of file
+		super(NewsletterView, self).add_item(feed, obj, defaults)
+	
+	def get_feed(self, feed_type, extra_context, kwargs=None):
+		title = self.newsletter.title
+		
+		defaults = {
+			'title': title
+		}
+		defaults.update(kwargs or {})
+		return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults)
\ No newline at end of file