Fixed #10059: `ModelAdmin.formfield_for_dbfield` now handles custom `Field` subclasses. Thanks, Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10454 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 3 deletions

diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index e798587040..c87d903ec5 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -108,9 +108,10 @@ class BaseModelAdmin(object):
 
         # If we've got overrides for the formfield defined, use 'em. **kwargs
         # passed to formfield_for_dbfield override the defaults.
-        if db_field.__class__ in self.formfield_overrides:
-            kwargs = dict(self.formfield_overrides[db_field.__class__], **kwargs)
-            return db_field.formfield(**kwargs)
+        for klass in db_field.__class__.mro(): 
+            if klass in self.formfield_overrides: 
+                kwargs = dict(self.formfield_overrides[klass], **kwargs) 
+                return db_field.formfield(**kwargs) 
 
         # For any other type of field, just call its formfield() method.
         return db_field.formfield(**kwargs)