Ticket #13599: separate_hidden_fields.patch

django/contrib/admin/templates/admin/change_list_results.html

@@ +1 @@
+{% if result_hidden_fields %}
+<div style="display: none"> {# DIV for HTML validation #}
+{% for item in result_hidden_fields %}{{ item }}{% endfor %}
+</div>
+{% endif %}
 {% if results %}
 <table cellspacing="0" id="result_list">
 <thead>

django/contrib/admin/templatetags/admin_list.py

@@ -189 +189 @@
             else:
                 result_repr = conditional_escape(result_repr)
             yield mark_safe(u'<td%s>%s</td>' % (row_class, result_repr))
-    if form:
+    if form and not form[cl.model._meta.pk.name].is_hidden:
         yield mark_safe(u'<td>%s</td>' % force_unicode(form[cl.model._meta.pk.name]))
 
 def results(cl):
@@ -200 +200 @@
         for res in cl.result_list:
             yield list(items_for_result(cl, res, None))
 
+def result_hidden_fields(cl):
+    if cl.formset:
+        for res, form in zip(cl.result_list, cl.formset.forms):
+            if form[cl.model._meta.pk.name].is_hidden:
+                yield mark_safe(force_unicode(form[cl.model._meta.pk.name]))
+
 def result_list(cl):
     """
     Displays the headers and data list together
     """
     return {'cl': cl,
+            'result_hidden_fields': list(result_hidden_fields(cl)),
             'result_headers': list(result_headers(cl)),
             'results': list(results(cl))}
 result_list = register.inclusion_tag("admin/change_list_results.html")(result_list)

tests/regressiontests/admin_changelist/tests.py

@@ -37 +37 @@
         hidden_input_elem = '<input type="hidden" name="form-0-id" value="1" id="id_form-0-id" />' 
         self.failIf(table_output.find(hidden_input_elem) == -1,
             'Failed to find expected hidden input element in: %s' % table_output)
-        self.failIf(table_output.find('<td>%s</td>' % hidden_input_elem) == -1,
-            'Hidden input element is not enclosed in <td> element.')
 
         # Test with list_editable fields
         m.list_display = ['id', 'name', 'parent']
@@ -54 +52 @@
         table_output = template.render(context)
         self.failIf(table_output.find(hidden_input_elem) == -1,
             'Failed to find expected hidden input element in: %s' % table_output)
-        self.failIf(table_output.find('<td>%s</td>' % hidden_input_elem) == -1,
-            'Hidden input element is not enclosed in <td> element.')
 
 class ChildAdmin(admin.ModelAdmin):
     list_display = ['name', 'parent']