diff options
| author | tom christie tom@tomchristie.com | 2011-01-27 21:19:25 +0000 |
|---|---|---|
| committer | tom christie tom@tomchristie.com | 2011-01-27 21:19:25 +0000 |
| commit | e9168b508b38b545406089c8592342e5eb70f9f9 (patch) | |
| tree | eca0ff410c21374a6e055be1c71bd671e640a4ed /flywheel/emitters.py | |
| parent | 216baa551fdce6394aa640ee0806c79b38658daf (diff) | |
| download | django-rest-framework-e9168b508b38b545406089c8592342e5eb70f9f9.tar.bz2 | |
Login/Logout and FlyWheel API link in HTML emitter - Add templates, quote next value, only use login/logout if settings.LOGIN_URL and settings.LOGOUT_URL are in urlconf
Diffstat (limited to 'flywheel/emitters.py')
| -rw-r--r-- | flywheel/emitters.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/flywheel/emitters.py b/flywheel/emitters.py index 458fa68c..d535f7b0 100644 --- a/flywheel/emitters.py +++ b/flywheel/emitters.py @@ -3,8 +3,9 @@ from django.template import RequestContext, loader from django import forms from flywheel.response import NoContent +from flywheel.utils import dict2xml, url_resolves -from utils import dict2xml, url_resolves +from urllib import quote_plus import string try: import json @@ -121,8 +122,8 @@ class DocumentingTemplateEmitter(BaseEmitter): form_instance = self._get_form_instance(self.resource) if url_resolves(settings.LOGIN_URL) and url_resolves(settings.LOGOUT_URL): - login_url = "%s?next=%s" % (settings.LOGIN_URL, self.resource.request.path) - logout_url = "%s?next=%s" % (settings.LOGOUT_URL, self.resource.request.path) + login_url = "%s?next=%s" % (settings.LOGIN_URL, quote_plus(self.resource.request.path)) + logout_url = "%s?next=%s" % (settings.LOGOUT_URL, quote_plus(self.resource.request.path)) else: login_url = None logout_url = None |