diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-07-29 18:31:27 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-07-29 18:31:27 +0000 |
| commit | b69b15fe02c47a754ab117dd4b5957eabe05c1ca (patch) | |
| tree | 76f6e04ba1c0145e7cff0824067c2318dc597bd9 | |
| parent | bf777442fa35efe7b980ca5880eb606795af7b43 (diff) | |
Fixed a subtle bug (really, an inconsistency) in ForeignKey that [8132] exposed by causing the model_forms test to fail.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/models/fields/related.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 7f6b1c67c8..f73ac68f8d 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -624,7 +624,7 @@ class ForeignKey(RelatedField, Field): assert isinstance(to, basestring), "%s(%r) is invalid. First parameter to ForeignKey must be either a model, a model name, or the string %r" % (self.__class__.__name__, to, RECURSIVE_RELATIONSHIP_CONSTANT) else: to_field = to_field or to._meta.pk.name - kwargs['verbose_name'] = kwargs.get('verbose_name', '') + kwargs['verbose_name'] = kwargs.get('verbose_name', None) if 'edit_inline_type' in kwargs: import warnings |