git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored Node.get_absolute_url and related functions (such as MultiView.reverse...
[philo.git]
/
contrib
/
penfield
/
utils.py
diff --git
a/contrib/penfield/utils.py
b/contrib/penfield/utils.py
index
0386d38
..
2c550db
100644
(file)
--- a/
contrib/penfield/utils.py
+++ b/
contrib/penfield/utils.py
@@
-56,13
+56,13
@@
class FeedMultiViewMixin(object):
current_site = Site.objects.get_current()
#Could this be done with request.path instead somehow?
feed_kwargs = {
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, request.node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/')
)
+ 'link':
request.node.construct_url(subpath=self.reverse(reverse_name, kwargs=kwargs), request=request, with_domain=True
)
}
feed = self.get_feed(feed_type, extra_context, feed_kwargs)
for obj in objects:
kwargs = {
}
feed = self.get_feed(feed_type, extra_context, feed_kwargs)
for obj in objects:
kwargs = {
- 'link':
'http://%s/%s/%s/' % (current_site.domain, request.node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/')
)
+ 'link':
request.node.construct_url(subpath=self.reverse(obj=obj), request=request, with_domain=True
)
}
self.add_item(feed, obj, kwargs=kwargs)
}
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):
return self.atom_feed(**defaults)
def feed_patterns(self, object_fetcher, page, base_name):
- feed_name = '%s_feed' % base_name
urlpatterns = patterns('',
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)
)
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):
return urlpatterns
def add_item(self, feed, obj, kwargs=None):