diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 5cb8f1f..5eff2fc 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -137,7 +137,7 @@ class InlineAdminForm(AdminForm): self.formset = formset self.original = original if original is not None: - self.original.content_type_id = ContentType.objects.get_for_model(original).pk + self.original.admin_helpers_content_type_id = ContentType.objects.get_for_model(original).pk self.show_url = original and hasattr(original, 'get_absolute_url') super(InlineAdminForm, self).__init__(form, fieldsets, prepopulated_fields) diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index 8548855..e95a6a0 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -10,7 +10,7 @@ {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}{% endif %} {% if inline_admin_form.show_url %} -
+ {% endif %} {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %} diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index 820928a..0694e31 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -14,7 +14,7 @@ {% endfor %} {% if inline_admin_formset.formset.can_delete %}{% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %} - {% if inline_admin_form.show_url %}{% trans "View on site" %}{% endif %} + {% if inline_admin_form.show_url %}{% trans "View on site" %}{% endif %}
{% endif %} {{ inline_admin_form.pk_field.field }} {{ inline_admin_form.fk_field.field }} {% spaceless %} @@ -48,22 +48,22 @@ {% endfor %} {% endfor %} {% endfor %} - + {% if inline_admin_formset.formset.can_delete %}