From 02b71d8ba9b730aaf78b7775b968d26978ac77e8 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Mon, 20 Nov 2017 15:22:03 +0100 Subject: [PATCH] Improve fix of PR #321 checking hasattr(self, 'fieldsets') alway returns true, and produces different effects. The hasattr(self, 'declared_fieldsets') was designed to detect whether Django injected that attribute. Amends: 5e150ea85ab7821adf9bdb730979ef89546ecc0a --- polymorphic/admin/childadmin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polymorphic/admin/childadmin.py b/polymorphic/admin/childadmin.py index bc10bc5..4255eda 100644 --- a/polymorphic/admin/childadmin.py +++ b/polymorphic/admin/childadmin.py @@ -183,7 +183,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin): def get_fieldsets(self, request, obj=None): # If subclass declares fieldsets or fields, this is respected - if hasattr(self, 'fieldsets') or hasattr(self, 'fields') or not self.base_fieldsets: + if self.fieldsets or or self.fields or not self.base_fieldsets: return super(PolymorphicChildModelAdmin, self).get_fieldsets(request, obj) # Have a reasonable default fieldsets,