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

Fix support for proxy models in formsets and admin inlines

fix_request_path_info
Diederik van der Boor 2017-10-08 22:21:44 +02:00
parent cafaf95f06
commit c2768f8101
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polymorphic/admin/generic.py
View File

@ -42,7 +42,7 @@ class GenericPolymorphicInlineModelAdmin(PolymorphicInlineModelAdmin, GenericInl
Expose the ContentType that the child relates to.
This can be used for the ``polymorphic_ctype`` field.
"""
return ContentType.objects.get_for_model(self.model)
return ContentType.objects.get_for_model(self.model, for_concrete_model=False)
def get_formset_child(self, request, obj=None, **kwargs):
# Similar to GenericInlineModelAdmin.get_formset(),

2
polymorphic/admin/helpers.py
View File

@ -42,7 +42,7 @@ class PolymorphicInlineAdminFormSet(InlineAdminFormSet):
"""
for form, original in zip(self.formset.initial_forms, self.formset.get_queryset()):
# Output the form
model = original.get_real_concrete_instance_class()
model = original.get_real_instance_class()
child_inline = self.opts.get_child_inline_instance(model)
view_on_site_url = self.opts.get_view_on_site_url(original)

9
polymorphic/formsets/models.py
View File

@ -14,7 +14,6 @@ class UnsupportedChildType(LookupError):
pass
class PolymorphicFormSetChild(object):
"""
Metadata to define the inline of a polymorphic child.
@ -46,7 +45,7 @@ class PolymorphicFormSetChild(object):
Expose the ContentType that the child relates to.
This can be used for the ''polymorphic_ctype'' field.
"""
return ContentType.objects.get_for_model(self.model)
return ContentType.objects.get_for_model(self.model, for_concrete_model=False)
def get_form(self, **kwargs):
"""
@ -161,7 +160,7 @@ class BasePolymorphicModelFormSet(BaseModelFormSet):
if self.is_bound:
if 'instance' in defaults:
# Object is already bound to a model, won't change the content type
model = defaults['instance'].get_real_concrete_instance_class() # respect proxy models
model = defaults['instance'].get_real_instance_class() # allow proxy models
else:
# Extra or empty form, use the provided type.
# Note this completely tru
@ -177,7 +176,7 @@ class BasePolymorphicModelFormSet(BaseModelFormSet):
raise UnsupportedChildType("Child model type {0} is not part of the formset".format(model))
else:
if 'instance' in defaults:
model = defaults['instance'].get_real_concrete_instance_class() # respect proxy models
model = defaults['instance'].get_real_instance_class() # allow proxy models
elif 'polymorphic_ctype' in defaults.get('initial', {}):
model = defaults['initial']['polymorphic_ctype'].model_class()
elif i < len(self.queryset_data):
@ -196,7 +195,7 @@ class BasePolymorphicModelFormSet(BaseModelFormSet):
def add_fields(self, form, index):
"""Add a hidden field for the content type."""
ct = ContentType.objects.get_for_model(form._meta.model)
ct = ContentType.objects.get_for_model(form._meta.model, for_concrete_model=False)
choices = [(ct.pk, ct)] # Single choice, existing forms can't change the value.
form.fields['polymorphic_ctype'] = forms.ChoiceField(choices=choices, initial=ct.pk, required=False, widget=forms.HiddenInput)
super(BasePolymorphicModelFormSet, self).add_fields(form, index)