Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid broken references to declared_fieldset 

Check if this attribute exists first, since it does not in recent django
versions.
fix_request_path_info
Hugo Osvaldo Barrera 2015-10-21 22:31:31 -03:00
parent a779187012
commit b996d1c377
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
polymorphic/admin.py
View File

@ -466,7 +466,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
kwargs.setdefault('form', self.base_form or self.form) kwargs.setdefault('form', self.base_form or self.form)
# prevent infinite recursion in django 1.6+ # prevent infinite recursion in django 1.6+
if not self.declared_fieldsets: if not getattr(self, 'declared_fieldsets', None):
kwargs.setdefault('fields', None) kwargs.setdefault('fields', None)
return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs) return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs)
@ -530,7 +530,8 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
def get_fieldsets(self, request, obj=None): def get_fieldsets(self, request, obj=None):
# If subclass declares fieldsets, this is respected # If subclass declares fieldsets, this is respected
if self.declared_fieldsets or not self.base_fieldsets: if (hasattr(self, 'declared_fieldset') and self.declared_fieldsets) \
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,