Ticket #10638: 10638.diff

django/contrib/admin/helpers.py

@@ -145 +145 @@
         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 # account for auto field
         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/tabular.html

@@ -26 +26 @@
           {% 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 %}