Ticket #13599: seperate_hidden_fields.patch

File seperate_hidden_fields.patch, 6.8 KB (added by skevy, 5 years ago)

Separate hidden fields from table w/ updated tests.

  • django/contrib/admin/media/css/changelists.css

     
    99    width: 100%;
    1010}
    1111
     12.change-list .hiddenfields { display:none; }
     13
    1214.change-list .filtered table {
    1315    border-right: 1px solid #ddd;
    1416}
  • django/contrib/admin/templatetags/admin_list.py

     
    189189            else:
    190190                result_repr = conditional_escape(result_repr)
    191191            yield mark_safe(u'<td%s>%s</td>' % (row_class, result_repr))
    192     if form:
     192    if form and not form[cl.model._meta.pk.name].is_hidden:
    193193        yield mark_safe(u'<td>%s</td>' % force_unicode(form[cl.model._meta.pk.name]))
    194194
    195195def results(cl):
     
    200200        for res in cl.result_list:
    201201            yield list(items_for_result(cl, res, None))
    202202
     203def result_hidden_fields(cl):
     204    if cl.formset:
     205        for res, form in zip(cl.result_list, cl.formset.forms):
     206            if form[cl.model._meta.pk.name].is_hidden:
     207                yield mark_safe(force_unicode(form[cl.model._meta.pk.name]))
     208
    203209def result_list(cl):
    204210    """
    205211    Displays the headers and data list together
    206212    """
    207213    return {'cl': cl,
     214            'result_hidden_fields': list(result_hidden_fields(cl)),
    208215            'result_headers': list(result_headers(cl)),
    209216            'results': list(results(cl))}
    210217result_list = register.inclusion_tag("admin/change_list_results.html")(result_list)
  • django/contrib/admin/templates/admin/change_list_results.html

     
     1{% if result_hidden_fields %}
     2<div class="hiddenfields"> {# DIV for HTML validation #}
     3{% for item in result_hidden_fields %}{{ item }}{% endfor %}
     4</div>
     5{% endif %}
    16{% if results %}
    27<div class="results">
    38<table cellspacing="0" id="result_list">
  • tests/regressiontests/admin_changelist/tests.py

     
    1 import unittest
    21from django.contrib import admin
    32from django.contrib.admin.views.main import ChangeList
    43from django.template import Context, Template
     4from django.test import TransactionTestCase
    55from regressiontests.admin_changelist.models import Child, Parent
    66
    7 class ChangeListTests(unittest.TestCase):
     7class ChangeListTests(TransactionTestCase):
    88    def test_select_related_preserved(self):
    99        """
    1010        Regression test for #10348: ChangeList.get_query_set() shouldn't
     
    1717        self.assertEqual(cl.query_set.query.select_related, {'parent': {'name': {}}})
    1818
    1919    def test_result_list_html(self):
    20         """
    21         Regression test for #11791: Inclusion tag result_list generates a
    22         table and this checks that the items are nested within the table
    23         element tags.
    24         """
    2520        new_parent = Parent.objects.create(name='parent')
    2621        new_child = Child.objects.create(name='name', parent=new_parent)
    2722        request = MockRequest()
     
    2924        cl = ChangeList(request, Child, m.list_display, m.list_display_links,
    3025                m.list_filter, m.date_hierarchy, m.search_fields,
    3126                m.list_select_related, m.list_per_page, m.list_editable, m)
    32         FormSet = m.get_changelist_formset(request)
    33         cl.formset = FormSet(queryset=cl.result_list)
     27        cl.formset = None
    3428        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
    3529        context = Context({'cl': cl})
    3630        table_output = template.render(context)
    37         hidden_input_elem = '<input type="hidden" name="form-0-id" value="1" id="id_form-0-id" />'
    38         self.failIf(table_output.find(hidden_input_elem) == -1,
    39             'Failed to find expected hidden input element in: %s' % table_output)
    40         self.failIf(table_output.find('<td>%s</td>' % hidden_input_elem) == -1,
    41             'Hidden input element is not enclosed in <td> element.')
     31        row_html = '<tbody><tr class="row1"><td><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>'
     32        self.failIf(table_output.find(row_html) == -1,
     33            'Failed to find expected row element: %s' % table_output)
    4234
     35    def test_result_list_editable_html(self):
     36        """
     37        Regression test for #11791: Inclusion tag result_list generates a
     38        table and this checks that the items are nested within the table
     39        element tags. Also tests #13599, and verifies that hidden fields
     40        when list_editable is enabled are rendered in a div outside the
     41        table.
     42        """
     43        new_parent = Parent.objects.create(name='parent')
     44        new_child = Child.objects.create(name='name', parent=new_parent)
     45        request = MockRequest()
     46        m = ChildAdmin(Child, admin.site)
     47
    4348        # Test with list_editable fields
    4449        m.list_display = ['id', 'name', 'parent']
    4550        m.list_display_links = ['id']
     
    5257        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
    5358        context = Context({'cl': cl})
    5459        table_output = template.render(context)
    55         self.failIf(table_output.find(hidden_input_elem) == -1,
    56             'Failed to find expected hidden input element in: %s' % table_output)
    57         self.failIf(table_output.find('<td>%s</td>' % hidden_input_elem) == -1,
    58             'Hidden input element is not enclosed in <td> element.')
     60        # make sure that hidden fields are in the correct place
     61        hiddenfields_div = '<div class="hiddenfields"><input type="hidden" name="form-0-id" value="1" id="id_form-0-id" /></div>'
     62        self.failIf(table_output.find(hiddenfields_div) == -1,
     63            'Failed to find hidden fields in: %s' % table_output)
     64        # make sure that list editable fields are rendered in divs correctly
     65        editable_name_field = '<input name="form-0-name" value="name" class="vTextField" maxlength="30" type="text" id="id_form-0-name" />'
     66        self.failIf('<td>%s</td>' % editable_name_field == -1,
     67            'Failed to find "name" list_editable field in: %s' % table_output)
    5968
    6069class ChildAdmin(admin.ModelAdmin):
    6170    list_display = ['name', 'parent']
Back to Top