All of my work from commits: dd4a194, 692644a, 4a60203, 5de46bc, 152042d, 64a2d4e...

[philo.git] / forms / entities.py

diff --git a/forms/entities.py b/forms/entities.py
index b6259a3..327a0eb 100644 (file)
--- a/forms/entities.py
+++ b/forms/entities.py
@@ -43,7 +43,9 @@ class EntityFormBase(ModelForm):
 _old_metaclass_new = ModelFormMetaclass.__new__
 
 def _new_metaclass_new(cls, name, bases, attrs):
 _old_metaclass_new = ModelFormMetaclass.__new__
 
 def _new_metaclass_new(cls, name, bases, attrs):

-       formfield_callback = attrs.get('formfield_callback', lambda f, **kwargs: f.formfield(**kwargs))
+       formfield_callback = attrs.get('formfield_callback', None)
+       if formfield_callback is None:
+               formfield_callback = lambda f, **kwargs: f.formfield(**kwargs)

        new_class = _old_metaclass_new(cls, name, bases, attrs)
        opts = new_class._meta
        if issubclass(new_class, EntityFormBase) and opts.model:
        new_class = _old_metaclass_new(cls, name, bases, attrs)
        opts = new_class._meta
        if issubclass(new_class, EntityFormBase) and opts.model: