Ticket #1408: django_admin_modules_description.diff

db/models/options.py

@@ -12 +12 @@
 
 DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering',
                  'unique_together', 'permissions', 'get_latest_by',
-                 'order_with_respect_to', 'app_label')
+                 'order_with_respect_to', 'app_label', 'description')
 
 class Options:
     def __init__(self, meta):
@@ -31 +31 @@
         self.pk = None
         self.has_auto_field = False
         self.one_to_one_field = None
+        self.description = None
 
     def merge_meta(self):
         meta_attrs = self.meta.__dict__

contrib/admin/views/doc.py

@@ -191 +191 @@
     return render_to_response('admin_doc/model_detail', {
         'name': '%s.%s' % (opts.app_label, opts.object_name),
         'summary': "Fields on %s objects" % opts.object_name,
+        'description': opts.description,
         'fields': fields,
     }, context_instance=RequestContext(request))
 model_detail = staff_member_required(model_detail)

contrib/admin/templates/admin_doc/model_detail.html

@@ -15 +15 @@
 {% block content %}
 <div id="content-main">
 <h1>{{ summary }}</h1>
+{% if description %}
+<p>{{ description }}</p>
+{% endif %}
 
 <div class="module">
 <table class="model">