Commit aefb07d8 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #8903 -- Corrected rendering of admin inline formsets (tabular... 

[1.0.X] Fixed #8903 -- Corrected rendering of admin inline formsets (tabular and stacked) when the inline model has a custom non-autofield primary key. Thanks to dgouldin for the patch.

Merge of r10666 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent e7555c09

django/contrib/admin/helpers.py

+11 −6
Original line number Diff line number Diff line
@@ -137,9 +137,14 @@ class InlineAdminForm(AdminForm): 
        for name, options in self.fieldsets:

            yield InlineFieldset(self.formset, self.form, name, **options)



    def has_auto_field(self):

        return self.form._meta.model._meta.has_auto_field



    def field_count(self):

        # tabular.html uses this function for colspan value.

        num_of_fields = 1 # always has at least one field

        num_of_fields = 0

        if self.has_auto_field():

            num_of_fields += 1

        num_of_fields += len(self.fieldsets[0][1]["fields"])

        if self.formset.can_order:

            num_of_fields += 1

django/contrib/admin/templates/admin/edit_inline/stacked.html

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  {% for fieldset in inline_admin_form %}

    {% include "admin/includes/fieldset.html" %}

  {% endfor %}

  {{ inline_admin_form.pk_field.field }}

  {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}

  {{ inline_admin_form.fk_field.field }}

</div>

{% endfor %}

django/contrib/admin/templates/admin/edit_inline/tabular.html

+9 −8
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
          {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}

          {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}

            </p>{% endif %}

          {{ inline_admin_form.pk_field.field }} {{ inline_admin_form.fk_field.field }}

          {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}

          {{ inline_admin_form.fk_field.field }}

          {% spaceless %}

          {% for fieldset in inline_admin_form %}

            {% for line in fieldset %}