Author: kmtracey Date: 2010-03-01 12:43:27 -0600 (Mon, 01 Mar 2010) New Revision: 12631
Modified: django/trunk/django/contrib/admin/templatetags/admin_list.py django/trunk/tests/regressiontests/admin_changelist/tests.py Log: Fixed #11791: Put hidden input elements in the change list inside td elements so they're valid HTML. Thanks panni and mlavin. Modified: django/trunk/django/contrib/admin/templatetags/admin_list.py =================================================================== --- django/trunk/django/contrib/admin/templatetags/admin_list.py 2010-03-01 14:43:26 UTC (rev 12630) +++ django/trunk/django/contrib/admin/templatetags/admin_list.py 2010-03-01 18:43:27 UTC (rev 12631) @@ -179,7 +179,7 @@ result_repr = conditional_escape(result_repr) yield mark_safe(u'<td%s>%s</td>' % (row_class, result_repr)) if form: - yield mark_safe(force_unicode(form[cl.model._meta.pk.name])) + yield mark_safe(u'<td>%s</td>' % force_unicode(form[cl.model._meta.pk.name])) def results(cl): if cl.formset: Modified: django/trunk/tests/regressiontests/admin_changelist/tests.py =================================================================== --- django/trunk/tests/regressiontests/admin_changelist/tests.py 2010-03-01 14:43:26 UTC (rev 12630) +++ django/trunk/tests/regressiontests/admin_changelist/tests.py 2010-03-01 18:43:27 UTC (rev 12631) @@ -1,7 +1,8 @@ import unittest from django.contrib import admin from django.contrib.admin.views.main import ChangeList -from regressiontests.admin_changelist.models import Child +from django.template import Context, Template +from regressiontests.admin_changelist.models import Child, Parent class ChangeListTests(unittest.TestCase): def test_select_related_preserved(self): @@ -11,10 +12,51 @@ """ m = ChildAdmin(Child, admin.site) cl = ChangeList(MockRequest(), Child, m.list_display, m.list_display_links, - m.list_filter,m.date_hierarchy, m.search_fields, + m.list_filter, m.date_hierarchy, m.search_fields, m.list_select_related, m.list_per_page, m.list_editable, m) self.assertEqual(cl.query_set.query.select_related, {'parent': {'name': {}}}) + def test_result_list_html(self): + """ + Regression test for #11791: Inclusion tag result_list generates a + table and this checks that the items are nested within the table + element tags. + """ + new_parent = Parent.objects.create(name='parent') + new_child = Child.objects.create(name='name', parent=new_parent) + request = MockRequest() + m = ChildAdmin(Child, admin.site) + cl = ChangeList(request, Child, m.list_display, m.list_display_links, + m.list_filter, m.date_hierarchy, m.search_fields, + m.list_select_related, m.list_per_page, m.list_editable, m) + FormSet = m.get_changelist_formset(request) + cl.formset = FormSet(queryset=cl.result_list) + template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}') + context = Context({'cl': cl}) + table_output = template.render(context) + 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'] + m.list_display_links = ['id'] + m.list_editable = ['name'] + cl = ChangeList(request, Child, m.list_display, m.list_display_links, + m.list_filter, m.date_hierarchy, m.search_fields, + m.list_select_related, m.list_per_page, m.list_editable, m) + FormSet = m.get_changelist_formset(request) + cl.formset = FormSet(queryset=cl.result_list) + template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}') + context = Context({'cl': cl}) + 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'] def queryset(self, request): -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-upda...@googlegroups.com. To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.