diff options
Diffstat (limited to 'papillon/polls')
| -rw-r--r-- | papillon/polls/feeds.py | 13 | ||||
| -rw-r--r-- | papillon/polls/views.py | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/papillon/polls/feeds.py b/papillon/polls/feeds.py index 5c11b9c..126dbe0 100644 --- a/papillon/polls/feeds.py +++ b/papillon/polls/feeds.py @@ -19,11 +19,11 @@ import time +from django.core.urlresolvers import reverse from django.core.exceptions import ObjectDoesNotExist from django.contrib.syndication.feeds import Feed from django.utils.translation import gettext_lazy as _ -from papillon.settings import BASE_SITE from papillon.polls.models import Poll, Vote, Voter @@ -39,14 +39,19 @@ class PollLatestEntries(Feed): def link(self, obj): if not obj: raise FeedDoesNotExist - return BASE_SITE + "/poll/" + obj.base_url + uri = self.request.build_absolute_uri(reverse('poll', + args=[obj.base_url])) + return uri def description(self, obj): return obj.description def item_link(self, voter): - url = "%s/poll/%s_%d" % (BASE_SITE, voter.poll.base_url, - time.mktime(voter.modification_date.timetuple())) + url = reverse('poll', args=[voter.poll.base_url]) + url = self.request.build_absolute_uri(reverse('poll', + args=[voter.poll.base_url])) + url = "%s_%d" % (url[:-1], # dirty... + time.mktime(voter.modification_date.timetuple())) return url def items(self, obj): diff --git a/papillon/polls/views.py b/papillon/polls/views.py index 26b3b34..43ff37f 100644 --- a/papillon/polls/views.py +++ b/papillon/polls/views.py @@ -133,6 +133,12 @@ def edit(request, admin_url): form = Form(instance=poll) response_dct['form'] = form response_dct['poll'] = poll + response_dct['base_url'] = request.build_absolute_uri(reverse('poll', + args=[poll.base_url])) + response_dct['edit_url'] = request.build_absolute_uri(reverse('edit', + args=[poll.admin_url])) + response_dct['choices_url'] = request.build_absolute_uri(reverse( + 'edit_choices_admin', args=[poll.admin_url])) return render_to_response('edit.html', response_dct) def editChoicesAdmin(request, admin_url): |