X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/0763589c29458e7c4e7b7bfb5424b724a112931d..f50cd63e40d7dfc9ffb51b679748b0003fddb019:/contrib/penfield/utils.py

diff --git a/contrib/penfield/utils.py b/contrib/penfield/utils.py
index 8103d9d..43c7c91 100644
--- a/contrib/penfield/utils.py
+++ b/contrib/penfield/utils.py
@@ -24,8 +24,8 @@ class FeedMultiViewMixin(object):
 		"""
 		Wraps an object-fetching function and renders the results as a page.
 		"""
-		def inner(request, node=None, extra_context=None, **kwargs):
-			objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
+		def inner(request, extra_context=None, **kwargs):
+			objects, extra_context = func(request=request, extra_context=extra_context, **kwargs)
 
 			context = self.get_context()
 			context.update(extra_context or {})
@@ -37,7 +37,7 @@ class FeedMultiViewMixin(object):
 			else:
 				context.update({self.list_var: objects})
 
-			return page.render_to_response(node, request, extra_context=context)
+			return page.render_to_response(request, extra_context=context)
 
 		return inner
 	
@@ -45,8 +45,8 @@ class FeedMultiViewMixin(object):
 		"""
 		Wraps an object-fetching function and renders the results as a rss or atom feed.
 		"""
-		def inner(request, node=None, extra_context=None, **kwargs):
-			objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
+		def inner(request, extra_context=None, **kwargs):
+			objects, extra_context = func(request=request, extra_context=extra_context, **kwargs)
 	
 			if 'HTTP_ACCEPT' in request.META and 'rss' in request.META['HTTP_ACCEPT'] and 'atom' not in request.META['HTTP_ACCEPT']:
 				feed_type = 'rss'
@@ -54,15 +54,15 @@ class FeedMultiViewMixin(object):
 				feed_type = 'atom'
 			
 			current_site = Site.objects.get_current()
-			
+			#Could this be done with request.path instead somehow?
 			feed_kwargs = {
-				'link': 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/'))
+				'link': 'http://%s/%s/%s/' % (current_site.domain, request.node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/'))
 			}
 			feed = self.get_feed(feed_type, extra_context, feed_kwargs)
 			
 			for obj in objects:
 				kwargs = {
-					'link': 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/'))
+					'link': 'http://%s/%s/%s/' % (current_site.domain, request.node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/'))
 				}
 				self.add_item(feed, obj, kwargs=kwargs)
 	
@@ -87,11 +87,14 @@ class FeedMultiViewMixin(object):
 		return self.atom_feed(**defaults)
 	
 	def feed_patterns(self, object_fetcher, page, base_name):
-		feed_name = '%s_feed' % base_name
 		urlpatterns = patterns('',
-			url(r'^%s/$' % self.feed_suffix, self.feed_view(object_fetcher, feed_name), name=feed_name),
 			url(r'^$', self.page_view(object_fetcher, page), name=base_name)
 		)
+		if self.feeds_enabled:
+			feed_name = '%s_feed' % base_name
+			urlpatterns = patterns('',
+				url(r'^%s/$' % self.feed_suffix, self.feed_view(object_fetcher, feed_name), name=feed_name),
+			) + urlpatterns
 		return urlpatterns
 	
 	def add_item(self, feed, obj, kwargs=None):