Projet

Général

Profil

0001-forms-don-t-add-empty-span-in-checkboxes-widget-2598.patch

Frédéric Péters, 31 août 2018 10:48

Télécharger (1,94 ko)

Voir les différences:

Subject: [PATCH] forms: don't add empty <span> in checkboxes widget (#25988)

 wcs/qommon/form.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
wcs/qommon/form.py
223 223
                r += htmltext(self.delim)
224 224
        return r.getvalue()
225 225

  
226
def checkbox_render_content(self):
226
def checkbox_render_content(self, empty_span=True):
227 227
    attrs = {'id': 'form_' + self.name}
228 228
    if self.required:
229 229
        attrs['aria-required'] = 'true'
230 230
    if self.attrs:
231 231
        attrs.update(self.attrs)
232
    return htmltag("input", xml_end=True, type="checkbox", name=self.name,
233
                   value="yes", checked=self.value and "checked" or None,
234
                   **attrs) + htmltext('<span></span>')  # for custom style
232
    checkbox = htmltag("input", xml_end=True, type="checkbox", name=self.name,
233
                       value="yes", checked=self.value and "checked" or None,
234
                       **attrs)
235
    if empty_span:
236
        return checkbox + htmltext('<span></span>')  # for custom style
237
    return checkbox
235 238
CheckboxWidget.render_content = checkbox_render_content
236 239

  
237 240

  
......
1117 1120
                if widget.value:
1118 1121
                    r += htmltext('<input type="hidden" name="%s" value="yes" >') % widget.name
1119 1122
                widget.name = widget.name + 'xx'
1120
            r += widget.render_content()
1123
            r += widget.render_content(empty_span=False)
1121 1124
            r += htmltext('<span>%s</span>') % widget.title
1122 1125
            r += htmltext('</label>')
1123 1126
            r += htmltext('</li>')
1124
-