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
This commit is contained in:
parent
16928a79e6
commit
c3b642187e
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue