diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2009-03-17 10:30:17 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2009-03-17 10:30:17 +0000 |
| commit | cf7a3fa7f06814a7a22198fb9f84f6b9c0f09461 (patch) | |
| tree | 2e4ac33f483f918df57a03877a1e296d52a7f089 | |
| parent | 536ccd1134d747bc22cf80c42c332e533146a9fe (diff) | |
Fixed #10512 -- Corrected the handling of extra fields on a ModelForm. Thanks to Alex Gaynor for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/forms/models.py | 2 | ||||
| -rw-r--r-- | tests/modeltests/model_forms/models.py | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py index 595b775f4f..d62a2ce713 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -163,7 +163,7 @@ def fields_for_model(model, fields=None, exclude=None, formfield_callback=lambda field_list.append((f.name, formfield)) field_dict = SortedDict(field_list) if fields: - field_dict = SortedDict([(f, field_dict[f]) for f in fields if (not exclude) or (exclude and f not in exclude)]) + field_dict = SortedDict([(f, field_dict.get(f)) for f in fields if (not exclude) or (exclude and f not in exclude)]) return field_dict class ModelFormOptions(object): diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py index 9261900bf8..4075250482 100644 --- a/tests/modeltests/model_forms/models.py +++ b/tests/modeltests/model_forms/models.py @@ -1450,6 +1450,19 @@ ValidationError: [u'Select a valid choice. z is not one of the available choices >>> core.parent <Inventory: Pear> +>>> class CategoryForm(ModelForm): +... description = forms.CharField() +... class Meta: +... model = Category +... fields = ['description', 'url'] + +>>> CategoryForm.base_fields.keys() +['description', 'url'] + +>>> print CategoryForm() +<tr><th><label for="id_description">Description:</label></th><td><input type="text" name="description" id="id_description" /></td></tr> +<tr><th><label for="id_url">The URL:</label></th><td><input id="id_url" type="text" name="url" maxlength="40" /></td></tr> + # Clean up >>> import shutil >>> shutil.rmtree(temp_storage_dir) |