diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-02-15 09:42:50 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-02-15 09:42:50 +0000 |
| commit | c3b642187e7122f0277517815c5ffa297efc7944 (patch) | |
| tree | 0d49a461348c0b20a3e9de8769116e45b9e44b3b | |
| parent | 16928a79e6c6e8b496a999ee3a1e92dbf655c5aa (diff) | |
Trivial comment change in ModelFormMetaclass to better reflect what we are doing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/newforms/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/newforms/models.py b/django/newforms/models.py index fbcf73c67a..f3809dc370 100644 --- a/django/newforms/models.py +++ b/django/newforms/models.py @@ -231,8 +231,8 @@ class ModelFormMetaclass(type): # If a model is defined, extract form fields from it. fields = fields_for_model(opts.model, opts.fields, opts.exclude, formfield_callback) - # Fields defined on the base classes override local fields and are - # always included. + # Override default model fields with any custom declared ones + # (plus, include all the other declared fields). fields.update(declared_fields) else: fields = declared_fields |
