mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-22 00:02:15 +00:00
Code Issues 32 Releases Wiki Activity

Fixed bug in dynamically-generated docs -- ForeignKeys were throwing an exception

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-18 20:35:51 +00:00
parent cf4c164e9f
commit 12c04fbf29
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/views/admin/doc.py
View File

@ -275,6 +275,7 @@ DATA_TYPE_MAPPING = {
'EmailField' : 'E-mail address', 'EmailField' : 'E-mail address',
'FileField' : 'File path', 'FileField' : 'File path',
'FloatField' : 'Decimal number', 'FloatField' : 'Decimal number',
'ForeignKey' : 'Integer',
'ImageField' : 'File path', 'ImageField' : 'File path',
'IntegerField' : 'Integer', 'IntegerField' : 'Integer',
'IPAddressField' : 'IP address', 'IPAddressField' : 'IP address',
@ -293,6 +294,9 @@ DATA_TYPE_MAPPING = {
} }
def get_readable_field_data_type(field): def get_readable_field_data_type(field):
# ForeignKey is a special case. Use the field type of the relation.
if field.__class__.__name__ == 'ForeignKey':
field = field.rel.get_related_field()
return DATA_TYPE_MAPPING[field.__class__.__name__] % field.__dict__ return DATA_TYPE_MAPPING[field.__class__.__name__] % field.__dict__
def extract_views_from_urlpatterns(urlpatterns, base=''): def extract_views_from_urlpatterns(urlpatterns, base=''):
@ -325,4 +329,4 @@ def simplify_regex(pattern):
pattern = pattern.replace('^', '').replace('$', '').replace('?', '').replace('//', '/') pattern = pattern.replace('^', '').replace('$', '').replace('?', '').replace('//', '/')
if not pattern.startswith('/'): if not pattern.startswith('/'):
pattern = '/' + pattern pattern = '/' + pattern
return pattern return pattern