Permalink
Browse files

Trivial comment change in ModelFormMetaclass to better reflect what w…

…e are doing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 16928a7 commit c3b642187e7122f0277517815c5ffa297efc7944 @malcolmt malcolmt committed Feb 15, 2008
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/newforms/models.py
View
4 django/newforms/models.py
@@ -231,8 +231,8 @@ def __new__(cls, name, bases, attrs,
# 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

0 comments on commit c3b6421

Please sign in to comment.