From 40809bdee4288ceb94bd969065ed7db875ce4b81 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sat, 18 Feb 2006 20:44:09 +0000 Subject: [PATCH] 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 --- django/core/meta/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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