Ticket #6197: models.2.diff

models.py

@@ -214 +214 @@
         self.exclude = getattr(options, 'exclude', None)
 
 class ModelFormMetaclass(type):
-    def __new__(cls, name, bases, attrs):
-        # TODO: no way to specify formfield_callback yet, do we need one, or
-        # should it be a special case for the admin?
+    def __new__(cls, name, bases, attrs,
+                formfield_callback=lambda f: f.formfield()):
         fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)]
         fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter))
 
@@ -253 +252 @@
                 base_model = getattr(base_opts, 'model', None)
                 if base_model is not None:
                     raise ImproperlyConfigured('%s defines more than one model.' % name)
-            model_fields = fields_for_model(opts.model, opts.fields, opts.exclude)
+            model_fields = fields_for_model(opts.model, opts.fields, opts.exclude,
+                                            formfield_callback)
             # fields declared in base classes override fields from the model
             model_fields.update(declared_fields)
             attrs['base_fields'] = model_fields