diff options
| -rw-r--r-- | django/contrib/admin/templates/admin_doc/model_detail.html | 4 | ||||
| -rw-r--r-- | django/contrib/admin/views/doc.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/django/contrib/admin/templates/admin_doc/model_detail.html b/django/contrib/admin/templates/admin_doc/model_detail.html index 31e5520aa0..0eb2971048 100644 --- a/django/contrib/admin/templates/admin_doc/model_detail.html +++ b/django/contrib/admin/templates/admin_doc/model_detail.html @@ -16,6 +16,10 @@ <div id="content-main"> <h1>{{ summary }}</h1> +{% if description %} + <p>{% filter escape|linebreaksbr %}{% trans description %}{% endfilter %}</p> +{% endif %} + <div class="module"> <table class="model"> <thead> diff --git a/django/contrib/admin/views/doc.py b/django/contrib/admin/views/doc.py index 0545d49367..7888bb0471 100644 --- a/django/contrib/admin/views/doc.py +++ b/django/contrib/admin/views/doc.py @@ -185,6 +185,7 @@ def model_detail(request, model): return render_to_response('admin_doc/model_detail', { 'name': '%s.%s' % (opts.app_label, opts.module_name), 'summary': "Fields on %s objects" % opts.verbose_name, + 'description' : model.__doc__, 'fields': fields, }, context_instance=DjangoContext(request)) model_detail = staff_member_required(model_detail) |