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: 5e150ea85a
fix_request_path_info
Diederik van der Boor 2017-11-20 15:22:03 +01:00
parent 8f0932b71e
commit 02b71d8ba9
1 changed files with 1 additions and 1 deletions

View File

@ -183,7 +183,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
def get_fieldsets(self, request, obj=None): def get_fieldsets(self, request, obj=None):
# If subclass declares fieldsets or fields, this is respected # 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) return super(PolymorphicChildModelAdmin, self).get_fieldsets(request, obj)
# Have a reasonable default fieldsets, # Have a reasonable default fieldsets,