summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBouke Haarsma <bouke@webatoom.nl>2013-11-05 11:49:16 +0100
committerBouke Haarsma <bouke@webatoom.nl>2013-11-22 13:30:50 +0100
commit48ce09f2f658c539fa6be4c223bca1b51146241d (patch)
tree8070d18f61c515eede4e0e2fa10d6b3260f6bb92
parent3ac823fc5b88db7808f4d1cbca122713c6c9e03a (diff)
Fixed missing admindocs' site_header
-rw-r--r--django/contrib/admindocs/views.py4
-rw-r--r--tests/admin_docs/tests.py6
2 files changed, 9 insertions, 1 deletions
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
index b4caff82c7..482d33e76f 100644
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@@ -5,6 +5,7 @@ import re
from django import template
from django.conf import settings
+from django.contrib import admin
from django.contrib.admin.views.decorators import staff_member_required
from django.db import models
from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
@@ -36,11 +37,12 @@ class BaseAdminDocsView(TemplateView):
if not utils.docutils_is_available:
# Display an error message for people without docutils
self.template_name = 'admin_doc/missing_docutils.html'
- return self.render_to_response({})
+ return self.render_to_response(admin.site.each_context())
return super(BaseAdminDocsView, self).dispatch(*args, **kwargs)
def get_context_data(self, **kwargs):
kwargs.update({'root_path': urlresolvers.reverse('admin:index')})
+ kwargs.update(admin.site.each_context())
return super(BaseAdminDocsView, self).get_context_data(**kwargs)
diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py
index d43205987e..0d4bcbd998 100644
--- a/tests/admin_docs/tests.py
+++ b/tests/admin_docs/tests.py
@@ -25,6 +25,9 @@ class AdminDocViewTests(TestCase):
self.client.login(username='super', password='secret')
response = self.client.get(reverse('django-admindocs-docroot'))
self.assertContains(response, '<h1>Documentation</h1>', html=True)
+ self.assertContains(response,
+ '<h1 id="site-name"><a href="/admin/">Django '
+ 'administration</a></h1>')
def test_bookmarklets(self):
response = self.client.get(reverse('django-admindocs-bookmarklets'))
@@ -80,6 +83,9 @@ class AdminDocViewTests(TestCase):
'<h3>The admin documentation system requires Python\'s '
'<a href="http://docutils.sf.net/">docutils</a> library.</h3>',
html=True)
+ self.assertContains(response,
+ '<h1 id="site-name"><a href="/admin/">Django '
+ 'administration</a></h1>')
finally:
utils.docutils_is_available = True