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

Merge pull request #69 from borgstrom/django16 

Prevent infinite recursion in Django 1.6
fix_request_path_info
Diederik van der Boor 2014-04-03 14:24:52 +02:00
parent 157f6b1057 d93add71fb
commit 08e900eb6d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
polymorphic/admin.py
View File

@ -409,6 +409,11 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
# Instead, pass the form unchecked here, because the standard ModelForm will just work. # Instead, pass the form unchecked here, because the standard ModelForm will just work.
# If the derived class sets the model explicitly, respect that setting. # If the derived class sets the model explicitly, respect that setting.
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+
if 'fields' not in kwargs and not self.declared_fieldsets:
kwargs['fields'] = None
return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs) return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs)