Changeset 7117
- Timestamp:
- 02/15/08 03:42:50 (11 months ago)
- Files:
-
- django/trunk/django/newforms/models.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/newforms/models.py
r7115 r7117 232 232 fields = fields_for_model(opts.model, opts.fields, 233 233 opts.exclude, formfield_callback) 234 # Fields defined on the base classes override local fields and are235 # always included.234 # Override default model fields with any custom declared ones 235 # (plus, include all the other declared fields). 236 236 fields.update(declared_fields) 237 237 else:
