p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed missing admindocs' site_header

This commit is contained in:
Bouke Haarsma 2013-11-05 11:49:16 +01:00
parent 3ac823fc5b
commit 48ce09f2f6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admindocs/views.py
View File

@ -5,6 +5,7 @@ import re
from django import template from django import template
from django.conf import settings from django.conf import settings
from django.contrib import admin
from django.contrib.admin.views.decorators import staff_member_required from django.contrib.admin.views.decorators import staff_member_required
from django.db import models from django.db import models
from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
@ -36,11 +37,12 @@ class BaseAdminDocsView(TemplateView):
if not utils.docutils_is_available: if not utils.docutils_is_available:
# Display an error message for people without docutils # Display an error message for people without docutils
self.template_name = 'admin_doc/missing_docutils.html' 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) return super(BaseAdminDocsView, self).dispatch(*args, **kwargs)
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs.update({'root_path': urlresolvers.reverse('admin:index')}) kwargs.update({'root_path': urlresolvers.reverse('admin:index')})
kwargs.update(admin.site.each_context())
return super(BaseAdminDocsView, self).get_context_data(**kwargs) return super(BaseAdminDocsView, self).get_context_data(**kwargs)

6
tests/admin_docs/tests.py
View File

@ -25,6 +25,9 @@ class AdminDocViewTests(TestCase):
self.client.login(username='super', password='secret') self.client.login(username='super', password='secret')
response = self.client.get(reverse('django-admindocs-docroot')) response = self.client.get(reverse('django-admindocs-docroot'))
self.assertContains(response, '<h1>Documentation</h1>', html=True) 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): def test_bookmarklets(self):
response = self.client.get(reverse('django-admindocs-bookmarklets')) response = self.client.get(reverse('django-admindocs-bookmarklets'))
@ -80,6 +83,9 @@ class AdminDocViewTests(TestCase):
'<h3>The admin documentation system requires Python\'s ' '<h3>The admin documentation system requires Python\'s '
'<a href="http://docutils.sf.net/">docutils</a> library.</h3>', '<a href="http://docutils.sf.net/">docutils</a> library.</h3>',
html=True) html=True)
self.assertContains(response,
'<h1 id="site-name"><a href="/admin/">Django '
'administration</a></h1>')
finally: finally:
utils.docutils_is_available = True utils.docutils_is_available = True