from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
from django.conf.urls.defaults import url, patterns
from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
from django.conf.urls.defaults import url, patterns
"""
Wraps an object-fetching function and renders the results as a page.
"""
def inner(request, node=None, extra_context=None, **kwargs):
"""
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, node, extra_context, **kwargs)
+ objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
page_num = kwargs.get('page', request.GET.get('page', 1))
paginator, paginated_page, objects = paginate(objects, self.per_page, page_num)
page_num = kwargs.get('page', request.GET.get('page', 1))
paginator, paginated_page, objects = paginate(objects, self.per_page, page_num)
Wraps an object-fetching function and renders the results as a rss or atom feed.
"""
def inner(request, node=None, extra_context=None, **kwargs):
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, node, extra_context, **kwargs)
+ objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
feed_type = 'atom'
feed = self.get_feed(feed_type, request, node, kwargs, reverse_name)
feed_type = 'atom'
feed = self.get_feed(feed_type, request, node, kwargs, reverse_name)
- feed.add_item(obj.title, '/%s/%s/' % (node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/')), description=obj.excerpt)
+ kwargs = {
+ 'link': 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/'))
+ }
+ self.add_item(feed, obj, kwargs=kwargs)
response = HttpResponse(mimetype=feed.mime_type)
feed.write(response, 'utf-8')
response = HttpResponse(mimetype=feed.mime_type)
feed.write(response, 'utf-8')
def get_feed(self, feed_type, request, node, kwargs, reverse_name):
title = self.feed_title
def get_feed(self, feed_type, request, node, kwargs, reverse_name):
title = self.feed_title
- link = '/%s/%s/' % (node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/'))
+ current_site = Site.objects.get_current()
+ link = 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/'))
description = self.feed_description
if feed_type == 'rss':
return self.rss_feed(title, link, description)
description = self.feed_description
if feed_type == 'rss':
return self.rss_feed(title, link, description)
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)
)
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)
)
- return urlpatterns
\ No newline at end of file
+ return urlpatterns
+
+ def add_item(self, feed, obj, kwargs=None):
+ defaults = kwargs or {}
+ feed.add_item(**defaults)
\ No newline at end of file