diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2006-02-18 20:44:09 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2006-02-18 20:44:09 +0000 |
| commit | 40809bdee4288ceb94bd969065ed7db875ce4b81 (patch) | |
| tree | 590a10a93b5e27a9294ab076bbd934c9711059d2 | |
| parent | bb8500449b8da7a11dbf8422f9b10d943281bb62 (diff) | |
Fixed #1038 -- Changed ForeignKey to calculate verbose_name by looking at its field name rather than the model of the related object. Thanks, Esaj
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/meta/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/meta/fields.py b/django/core/meta/fields.py index fe6eec5c97..635c9d1260 100644 --- a/django/core/meta/fields.py +++ b/django/core/meta/fields.py @@ -692,7 +692,7 @@ class ForeignKey(Field): kwargs['verbose_name'] = kwargs.get('verbose_name', '') else: to_field = to_field or to._meta.pk.name - kwargs['verbose_name'] = kwargs.get('verbose_name', to._meta.verbose_name) + kwargs['verbose_name'] = kwargs.get('verbose_name', '') if kwargs.has_key('edit_inline_type'): import warnings |