diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-12-01 07:03:23 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-12-01 07:03:23 +0000 |
| commit | b5288e732c7a0c26034fa7a630939578551f6638 (patch) | |
| tree | 9f65277e10d1e999857dc9666e28f83b1167a24d /django/contrib/admin/views | |
| parent | 15ea158c967089e2ff0bd3efd3839f51b281f50e (diff) | |
Fixed #951 -- Admin bookmarklets no longer assume admin is rooted at '/'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin/views')
| -rw-r--r-- | django/contrib/admin/views/doc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/views/doc.py b/django/contrib/admin/views/doc.py index 3a36582326..5d73933139 100644 --- a/django/contrib/admin/views/doc.py +++ b/django/contrib/admin/views/doc.py @@ -19,8 +19,10 @@ def doc_index(request): doc_index = staff_member_required(doc_index) def bookmarklets(request): + # Hack! This couples this view to the URL it lives at. + admin_root = request.path[:-len('doc/bookmarklets/')] return render_to_response('admin_doc/bookmarklets', { - 'admin_url': "%s://%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', request.META['HTTP_HOST']), + 'admin_url': "%s://%s%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', request.META['HTTP_HOST'], admin_root), }, context_instance=DjangoContext(request)) bookmarklets = staff_member_required(bookmarklets) |