Author: kmtracey
Date: 2010-03-01 12:46:20 -0600 (Mon, 01 Mar 2010)
New Revision: 12632
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/contrib/admin/templatetags/admin_list.py
django/branches/releases/1.1.X/tests/regressiontests/admin_changelist/tests.py
Log:
[1.1.X] Fixed #11791: Put hidden input elements in the change list inside td
elements so they're valid HTML. Thanks panni and mlavin.
r12631 from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12448,12457,12461-12464,12467,12473,12475,12490,12492,12497-12498,12502,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12581,12584,12616,12621-12622
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12448,12457,12461-12464,12467,12473,12475,12490,12492,12497-12498,12502,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12581,12584,12616,12621-12622,12631
Modified:
django/branches/releases/1.1.X/django/contrib/admin/templatetags/admin_list.py
===================================================================
---
django/branches/releases/1.1.X/django/contrib/admin/templatetags/admin_list.py
2010-03-01 18:43:27 UTC (rev 12631)
+++
django/branches/releases/1.1.X/django/contrib/admin/templatetags/admin_list.py
2010-03-01 18:46:20 UTC (rev 12632)
@@ -242,7 +242,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/branches/releases/1.1.X/tests/regressiontests/admin_changelist/tests.py
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/admin_changelist/tests.py
2010-03-01 18:43:27 UTC (rev 12631)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_changelist/tests.py
2010-03-01 18:46:20 UTC (rev 12632)
@@ -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.
