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

[1.2.X] Fixed #11447 -- Ensured that ForeignKey widgets in a list-editable... 

[1.2.X] Fixed #11447 -- Ensured that ForeignKey widgets in a list-editable admin changelist won't wrap split the widget. Thanks to patrick@vonautomatisch.at for the report, and Julien Phalip for the patch.

Backport of r15656 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 049b3ff8

django/contrib/admin/templatetags/admin_list.py

+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,9 @@ def items_for_result(cl, result, form): 
                        result_repr = escape(field_val)

                else:

                    result_repr = display_for_field(value, f)

                if isinstance(f, models.DateField) or isinstance(f, models.TimeField):

                if isinstance(f, models.DateField)\

                or isinstance(f, models.TimeField)\

                or isinstance(f, models.ForeignKey):

                    row_class = ' class="nowrap"'

        if force_unicode(result_repr) == '':

            result_repr = mark_safe(' ')

tests/regressiontests/admin_changelist/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class ChangeListTests(TransactionTestCase): 
        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')

        context = Context({'cl': cl})

        table_output = template.render(context)

        row_html = '<tbody><tr class="row1"><td class="action-checkbox"><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td>(None)</td></tr></tbody>'

        row_html = '<tbody><tr class="row1"><td class="action-checkbox"><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td class="nowrap">(None)</td></tr></tbody>'

        self.assertFalse(table_output.find(row_html) == -1,

            'Failed to find expected row element: %s' % table_output)
@@ -53,7 +53,7 @@ class ChangeListTests(TransactionTestCase): 
        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')

        context = Context({'cl': cl})

        table_output = template.render(context)

        row_html = '<tbody><tr class="row1"><td class="action-checkbox"><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td>Parent object</td></tr></tbody>'

        row_html = '<tbody><tr class="row1"><td class="action-checkbox"><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td class="nowrap">Parent object</td></tr></tbody>'

        self.assertFalse(table_output.find(row_html) == -1,

            'Failed to find expected row element: %s' % table_output)