0002-forms-use-a-template-to-render-select-widgets-17964.patch

Frédéric Péters, 11 août 2017 10:53

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/2] forms: use a template to render select widgets (#17964)

 wcs/qommon/form.py                                 | 32 ++++++++--------------
 .../templates/qommon/forms/widgets/select.html     | 16 +++++++++++
 2 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 wcs/qommon/templates/qommon/forms/widgets/select.html

     class SingleSelectHintWidget(SingleSelectWidget):
         template_name = 'qommon/forms/widgets/select.html'
         def __init__(self, name, value=None, **kwargs):
             self.options_with_attributes = kwargs.pop('options_with_attributes', None)
             super(SingleSelectHintWidget, self).__init__(name, value=value, **kwargs)
-...
         def separate_hint(self):
             return (self.hint and len(self.hint) > 80)
         def render_content(self):
             attrs = {'id': 'form_' + self.name}
             if self.attrs:
                 attrs.update(self.attrs)
             tags = [htmltag('select', name=self.name, **attrs)]
             options = self.options[:]
             include_disabled = False
         def get_options(self):
             if self.options_with_attributes:
                 options = self.options_with_attributes
                 include_disabled = True
             if not self.separate_hint() and self.hint:
                 r = htmltag('option', value='', selected=None)
                 tags.append(r + htmlescape(self.hint) + htmltext('</option>'))
                 if self.options[0][0] is None:
                     # hint has been put as first element, skip the default empty
                     # value.
                     options = self.options[1:]
                 options = self.options_with_attributes[:]
             else:
                 options = self.options[:]
             if options[0][0] is None:
                 options = self.options[1:]
             tags = []
             for option in options:
                 object, description, key = option[:3]
                 html_attrs = {}
-...
                     html_attrs['disabled'] = 'disabled'
                 if description is None:
                     description = ''
                 r = htmltag('option', **html_attrs)
                 tags.append(r + htmlescape(description) + htmltext('</option>'))
             tags.append(htmltext('</select>'))
             return htmltext('\n').join(tags)
                 yield {'description': description, 'attrs': html_attrs,
                         'options': option[-1] if self.options_with_attributes else None}
         def get_hint(self):
             if self.separate_hint():

     {% extends "qommon/forms/widget.html" %}
     {% block widget-control %}
     <select id="form_{{widget.name}}" name="{{widget.name}}"
         {% for attr in widget.attrs.items %}{{attr.0}}="{{attr.1}}"{% endfor %}>
       {% if not widget.separate_hint and widget.hint %}
       <option value="">{{ widget.hint }}</option>
       {% endif %}
       {% for option in widget.get_options %}
       <option{% for attr in option.attrs.items %} {{attr.0}}="{{attr.1}}"{% endfor %}>{{ option.description }}</option>
       {% empty %}
         {% if widget.separate_hint or not widget.hint %}
         <option value="">---</option>
         {% endif %}
       {% endfor %}
     </select>
     {% endblock %}
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-forms-use-a-template-to-render-select-widgets-17964.patch