# HG changeset patch # User Sylvain Thénault # Date 1249030035 -7200 # Node ID 879912fe94e1d0343c92c66b501953d515503c7e # Parent d84ea8753290e950c72ec20feae6441b0b2d2e81 [xhtml form renderer] fix html structure, move header where we are sure to display it when necesary (_render_fields not displayed if main form has no visible fields diff -r d84ea8753290 -r 879912fe94e1 web/views/formrenderers.py --- a/web/views/formrenderers.py Fri Jul 31 10:42:15 2009 +0200 +++ b/web/views/formrenderers.py Fri Jul 31 10:47:15 2009 +0200 @@ -311,6 +311,19 @@ def render_fields(self, w, form, values): if not form.is_subform: w(u'') + subfields = [field for field in form.forms[0].fields + if self.display_field(form, field) + and field.is_visible()] + if subfields: + # main form, display table headers + w(u'') + w(u'' % + tags.input(type='checkbox', + title=self.req._('toggle check boxes'), + onclick="setCheckboxesState('eid', this.checked)")) + for field in subfields: + w(u'' % self.req._(field.label)) + w(u'') super(EntityCompositeFormRenderer, self).render_fields(w, form, values) if not form.is_subform: w(u'
%s%s
') @@ -343,22 +356,10 @@ field.widget.attrs['onkeypress'] = cbsetstate # XXX else w(u'
%s
' % field.render(form, self)) - w(u'') + w(u'\n') + w(u'') else: self._main_display_fields = fields - subfields = [field for field in form.forms[0].fields - if self.display_field(form, field) - and field.is_visible()] - if subfields: - # main form, display table headers - w(u'') - w(u'%s' % - tags.input(type='checkbox', - title=self.req._('toggle check boxes'), - onclick="setCheckboxesState('eid', this.checked)")) - for field in subfields: - w(u'%s' % self.req._(field.label)) - w(u'') class EntityFormRenderer(EntityBaseFormRenderer):