Projet

Général

Profil

0002-forms-remove-possibility-to-add-a-custom-message-to-.patch

Frédéric Péters, 28 mai 2018 06:35

Télécharger (3,06 ko)

Voir les différences: 

Subject: [PATCH 2/2] forms: remove possibility to add a custom message to
 widgets (#24100)

It was only used to add a "This value has been prefilled" message and we
do not do that anymore.

 wcs/qommon/form.py                            | 19 -------------------
 wcs/qommon/templates/qommon/forms/widget.html |  2 --
 2 files changed, 21 deletions(-)
wcs/qommon/form.py
85 85 
        return _(error)
86 86 
    return error
87 87 

  		




  88
  
  
    
def set_message(self, message):

  		




  89
  
  
    
    self.message = message

  		




  90
  
  
    

  		




  91
  
  
    
def get_message(self):

  		




  92
  
  
    
    if hasattr(self, 'message'):

  		




  93
  
  
    
        return self.message

  		




  94
  
  
    
    else:

  		




  95
  
  
    
        return ''

  		




  96
  
  
    

  		




  97
  
  
    
def render_message(self, message):

  		




  98
  
  
    
    if message:

  		




  99
  
  
    
        return htmltext('<div class="message">%s</div>') % message

  		




  100
  
  
    
    else:

  		




  101
  
  
    
        return ''

  		




  102
  
  
    

  		




  103
  88
  
    
def is_prefilled(self):

  		




  104
  89
  
    
    if hasattr(self, 'prefilled'):

  		




  105
  90
  
    
        return self.prefilled

  		




  ......




  143
  128
  
    
    self.rendered_title = lambda: safe(self.render_title(self.get_title()))

  		




  144
  129
  
    
    self.rendered_error = lambda: safe(self.render_error(self.get_error()))

  		




  145
  130
  
    
    self.rendered_hint = lambda: safe(self.render_hint(self.get_hint()))

  		




  146
  
  
    
    self.rendered_message = lambda: safe(self.render_message(self.get_message()))

  		




  147
  131
  
    
    context = {'widget': self}

  		




  148
  132
  
    
    template_names = get_template_names(self)

  		




  149
  133
  
    
    return htmltext(render_template(template_names, context))

  		




  ......




  151
  135
  
    
Widget.get_error = get_i18n_error

  		




  152
  136
  
    
Widget.render = render

  		




  153
  137
  
    
Widget.cleanup = None

  		




  154
  
  
    
Widget.set_message = set_message

  		




  155
  
  
    
Widget.get_message = get_message

  		




  156
  
  
    
Widget.render_message = render_message

  		




  157
  138
  
    
Widget.render_title = render_title

  		




  158
  139
  
    
Widget.is_prefilled = is_prefilled

  		




  159
  140
  
    

  		












  

    
      wcs/qommon/templates/qommon/forms/widget.html
    
  





  2
  2
  
    
<div class="widget {{widget.class_name}} {{widget.extra_css_class}}

  		




  3
  3
  
    
     {% if widget.readonly %}widget-readonly{% endif %}

  		




  4
  4
  
    
     {% if widget.get_error %}widget-with-error{% endif %}

  		




  5
  
  
    
     {% if widget.get_message %}widget-with-message{% endif %}

  		




  6
  5
  
    
     {% if widget.is_required %}widget-required{% else %}widget-optional{% endif %}

  		




  7
  6
  
    
     {% if widget.is_prefilled %}widget-prefilled{% endif %}"

  		




  8
  7
  
    
     {% if widget.div_id %}id="{{widget.div_id}}" data-valuecontainerid="form_{{widget.name}}"{% endif %}

  		




  ......




  27
  26
  
    
    {% block widget-error %}{{widget.rendered_error}}{% endblock %}

  		




  28
  27
  
    
    {% block widget-control %}{{widget.render_content|safe}}{% endblock %}

  		




  29
  28
  
    
    {% block widget-hint %}{{widget.rendered_hint}}{% endblock %}

  		




  30
  
  
    
    {% block widget-message %}{{widget.rendered_message}}{% endblock %}

  		




  31
  29
  
    
  </div>

  		




  32
  30
  
    
  {% endblock %}

  		




  33
  31
  
    
  {% if widget.render_br %}

  		




  34
  
  
    
-