multi-auth: Merged to [2964]

git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@2965 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 7 insertions, 4 deletions

diff --git a/django/contrib/admin/views/doc.py b/django/contrib/admin/views/doc.py
index f3675b6adf..e48e9800a7 100644
--- a/django/contrib/admin/views/doc.py
+++ b/django/contrib/admin/views/doc.py
@@ -206,12 +206,14 @@ def model_detail(request, app_label, model_name):
         verbose = "related `%s.%s` objects" % (rel.opts.app_label, rel.opts.object_name)
         accessor = rel.get_accessor_name()
         fields.append({
-            'name' : "%s.all" % accessor,
-            'verbose' : utils.parse_rst("all " + verbose , 'model', 'model:' + opts.module_name),
+            'name'      : "%s.all" % accessor,
+            'data_type' : 'List',
+            'verbose'   : utils.parse_rst("all " + verbose , 'model', 'model:' + opts.module_name),
         })
         fields.append({
-            'name' : "%s.count" % accessor,
-            'verbose' : utils.parse_rst("number of " + verbose , 'model', 'model:' + opts.module_name),
+            'name'      : "%s.count" % accessor,
+            'data_type' : 'Integer',
+            'verbose'   : utils.parse_rst("number of " + verbose , 'model', 'model:' + opts.module_name),
         })
 
     return render_to_response('admin_doc/model_detail.html', {
@@ -282,6 +284,7 @@ DATA_TYPE_MAPPING = {
     'DateTimeField'             : _('Date (with time)'),
     'EmailField'                : _('E-mail address'),
     'FileField'                 : _('File path'),
+    'FilePathField'             : _('File path'),
     'FloatField'                : _('Decimal number'),
     'ForeignKey'                : _('Integer'),
     'ImageField'                : _('File path'),