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

further childadmin fieldsets improvements

fix_request_path_info
Tadas Dailyda 2017-11-20 16:15:10 +02:00
parent 02b71d8ba9
commit 15426dc695
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
polymorphic/admin/childadmin.py
View File

@ -62,6 +62,10 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
# 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 when this is called from get_subclass_fields
if not hasattr(self, 'fieldsets') and not hasattr(self, 'fields'):
kwargs.setdefault('fields', None)
return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs) return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs)
def get_model_perms(self, request): def get_model_perms(self, request):
@ -181,9 +185,14 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
# ---- Extra: improving the form/fieldset default display ---- # ---- Extra: improving the form/fieldset default display ----
def get_base_fieldsets(self, request, obj=None):
return self.base_fieldsets
def get_fieldsets(self, request, obj=None): def get_fieldsets(self, request, obj=None):
base_fieldsets = self.get_base_fieldsets(request, obj)
# If subclass declares fieldsets or fields, this is respected # If subclass declares fieldsets or fields, this is respected
if self.fieldsets or or self.fields or not self.base_fieldsets: if self.fieldsets 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,
@ -192,11 +201,11 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
if other_fields: if other_fields:
return ( return (
self.base_fieldsets[0], base_fieldsets[0],
(self.extra_fieldset_title, {'fields': other_fields}), (self.extra_fieldset_title, {'fields': other_fields}),
) + self.base_fieldsets[1:] ) + base_fieldsets[1:]
else: else:
return self.base_fieldsets return base_fieldsets
def get_subclass_fields(self, request, obj=None): def get_subclass_fields(self, request, obj=None):
# Find out how many fields would really be on the form, # Find out how many fields would really be on the form,
@ -210,7 +219,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
subclass_fields = list(six.iterkeys(form.base_fields)) + list(self.get_readonly_fields(request, obj)) subclass_fields = list(six.iterkeys(form.base_fields)) + list(self.get_readonly_fields(request, obj))
# Find which fields are not part of the common fields. # Find which fields are not part of the common fields.
for fieldset in self.base_fieldsets: for fieldset in self.get_base_fieldsets(request, obj):
for field in fieldset[1]['fields']: for field in fieldset[1]['fields']:
try: try:
subclass_fields.remove(field) subclass_fields.remove(field)