test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed #21685 -- Displayed app verbose name in admindocs model index 

Backport of 4cf82e5bcf from master.
This commit is contained in:
Claude Paroz 2014-05-10 18:06:25 +02:00
parent e9d0ef19bc
commit 9d0ebceb32
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/admindocs/templates/admin_doc/model_index.html
View File

@ -17,12 +17,12 @@
<h1>{% trans 'Model documentation' %}</h1> <h1>{% trans 'Model documentation' %}</h1>
{% regroup models by app_label as grouped_models %} {% regroup models by app_config as grouped_models %}
<div id="content-main"> <div id="content-main">
{% for group in grouped_models %} {% for group in grouped_models %}
<div class="module"> <div class="module">
<h2 id="app-{{ group.grouper }}">{{ group.grouper|capfirst }}</h2> <h2 id="app-{{ group.grouper.label }}">{{ group.grouper.verbose_name }} ({{ group.grouper.name }})</h2>
<table class="xfull"> <table class="xfull">
{% for model in group.list %} {% for model in group.list %}
@ -42,9 +42,9 @@
<div class="module"> <div class="module">
<h2>{% trans 'Model groups' %}</h2> <h2>{% trans 'Model groups' %}</h2>
<ul> <ul>
{% regroup models by app_label as grouped_models %} {% regroup models by app_config as grouped_models %}
{% for group in grouped_models %} {% for group in grouped_models %}
<li><a href="#app-{{ group.grouper }}">{{ group.grouper|capfirst }}</a></li> <li><a href="#app-{{ group.grouper.label }}">{{ group.grouper.verbose_name }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>

6
tests/admin_docs/tests.py
View File

@ -81,7 +81,11 @@ class AdminDocViewTests(TestCase):
def test_model_index(self): def test_model_index(self):
response = self.client.get(reverse('django-admindocs-models-index')) response = self.client.get(reverse('django-admindocs-models-index'))
self.assertContains(response, '<h2 id="app-auth">Auth</h2>', html=True) self.assertContains(
response,
'<h2 id="app-auth">Authentication and Authorization (django.contrib.auth)</h2>',
html=True
)
def test_template_detail(self): def test_template_detail(self):
response = self.client.get(reverse('django-admindocs-templates', response = self.client.get(reverse('django-admindocs-templates',