From 180df8e98c84df02c06412adb0c8c29a44ba9330 Mon Sep 17 00:00:00 2001 From: Tadas Dailyda Date: Mon, 20 Nov 2017 17:34:05 +0200 Subject: [PATCH] fix detecting whether childadmin has explicitly defined fields/fieldsets --- polymorphic/admin/childadmin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polymorphic/admin/childadmin.py b/polymorphic/admin/childadmin.py index 41d12bb..2695d1a 100644 --- a/polymorphic/admin/childadmin.py +++ b/polymorphic/admin/childadmin.py @@ -63,8 +63,8 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin): kwargs.setdefault('form', self.base_form or self.form) # prevent infinite recursion when this is called from get_subclass_fields - if not hasattr(self, 'fieldsets') and not hasattr(self, 'fields'): - kwargs.setdefault('fields', None) + if not self.fieldsets and not self.fields: + kwargs.setdefault('fields', '__all__') return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs)