From bc07a498fe789ed5c4057d56bac6ba50d7296ed1 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 11 May 2009 00:01:40 +0000 Subject: [1.0.X] Fixed #10792 -- Ensured that ModelChoiceFields don't provide an empty option when the underlying field has blank=False and there is a default value available. Thanks to carljm for the report and patch. Merge of r10729 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10733 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/forms/fields.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index dbb87f6012..09aef7d29c 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -752,6 +752,10 @@ example:: # No empty label field2 = forms.ModelChoiceField(queryset=..., empty_label=None) + Note that if a ``ModelChoiceField`` is required and has a default + initial value, no empty choice is created (regardless of the value + of ``empty_label``). + ``ModelMultipleChoiceField`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.3