git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjusted feedmultiviewmixin to allow more customization of objects being added to...
[philo.git]
/
contrib
/
penfield
/
utils.py
diff --git
a/contrib/penfield/utils.py
b/contrib/penfield/utils.py
index
7b5e946
..
591ac04
100644
(file)
--- a/
contrib/penfield/utils.py
+++ b/
contrib/penfield/utils.py
@@
-1,7
+1,9
@@
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
+from django.contrib.sites.models import Site
from django.core.urlresolvers import reverse
from django.http import HttpResponse
from django.core.urlresolvers import reverse
from django.http import HttpResponse
+from philo.utils import paginate
class FeedMultiViewMixin(object):
class FeedMultiViewMixin(object):
@@
-15,8
+17,9
@@
class FeedMultiViewMixin(object):
atom_feed = Atom1Feed
rss_feed = Rss201rev2Feed
feed_description = ''
atom_feed = Atom1Feed
rss_feed = Rss201rev2Feed
feed_description = ''
+ list_var = 'objects'
- def page_view(self, func, page
, list_var='entries'
):
+ def page_view(self, func, page):
"""
Wraps an object-fetching function and renders the results as a page.
"""
"""
Wraps an object-fetching function and renders the results as a page.
"""
@@
-26,12
+29,12
@@
class FeedMultiViewMixin(object):
context = self.get_context()
context.update(extra_context or {})
context = self.get_context()
context.update(extra_context or {})
- if 'page' in kwargs or 'page' in request.GET:
+ if 'page' in kwargs or 'page' in request.GET
or (hasattr(self, 'per_page') and self.per_page)
:
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)
- context.update({'paginator': paginator, 'paginated_page': paginated_page, list_var: objects})
+ context.update({'paginator': paginator, 'paginated_page': paginated_page,
self.
list_var: objects})
else:
else:
- context.update({list_var: objects})
+ context.update({
self.
list_var: objects})
return page.render_to_response(node, request, extra_context=context)
return page.render_to_response(node, request, extra_context=context)
@@
-50,9
+53,13
@@
class FeedMultiViewMixin(object):
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)
+ current_site = Site.objects.get_current()
for obj in objects:
for obj in objects:
- feed.add_item(obj.title, '/%s/%s/' % (node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/')), description=self.get_obj_description(obj))
+ 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')
@@
-62,7
+69,8
@@
class FeedMultiViewMixin(object):
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)
@@
-77,5
+85,6
@@
class FeedMultiViewMixin(object):
)
return urlpatterns
)
return urlpatterns
- def get_obj_description(self, obj):
- raise NotImplementedError
\ No newline at end of file
+ def add_item(self, feed, obj, kwargs=None):
+ defaults = kwargs or {}
+ feed.add_item(**defaults)
\ No newline at end of file