From 3fa38cce3e4139790f13adf54fa5c4c223ea80f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 28 May 2018 06:32:16 +0200
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(-)

diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index 06e9a123..bf74423c 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -85,21 +85,6 @@ def get_i18n_error(self, request=None):
         return _(error)
     return error
 
-def set_message(self, message):
-    self.message = message
-
-def get_message(self):
-    if hasattr(self, 'message'):
-        return self.message
-    else:
-        return ''
-
-def render_message(self, message):
-    if message:
-        return htmltext('<div class="message">%s</div>') % message
-    else:
-        return ''
-
 def is_prefilled(self):
     if hasattr(self, 'prefilled'):
         return self.prefilled
@@ -143,7 +128,6 @@ def render(self):
     self.rendered_title = lambda: safe(self.render_title(self.get_title()))
     self.rendered_error = lambda: safe(self.render_error(self.get_error()))
     self.rendered_hint = lambda: safe(self.render_hint(self.get_hint()))
-    self.rendered_message = lambda: safe(self.render_message(self.get_message()))
     context = {'widget': self}
     template_names = get_template_names(self)
     return htmltext(render_template(template_names, context))
@@ -151,9 +135,6 @@ def render(self):
 Widget.get_error = get_i18n_error
 Widget.render = render
 Widget.cleanup = None
-Widget.set_message = set_message
-Widget.get_message = get_message
-Widget.render_message = render_message
 Widget.render_title = render_title
 Widget.is_prefilled = is_prefilled
 
diff --git a/wcs/qommon/templates/qommon/forms/widget.html b/wcs/qommon/templates/qommon/forms/widget.html
index 96ccb2e5..e205ad49 100644
--- a/wcs/qommon/templates/qommon/forms/widget.html
+++ b/wcs/qommon/templates/qommon/forms/widget.html
@@ -2,7 +2,6 @@
 <div class="widget {{widget.class_name}} {{widget.extra_css_class}}
      {% if widget.readonly %}widget-readonly{% endif %}
      {% if widget.get_error %}widget-with-error{% endif %}
-     {% if widget.get_message %}widget-with-message{% endif %}
      {% if widget.is_required %}widget-required{% else %}widget-optional{% endif %}
      {% if widget.is_prefilled %}widget-prefilled{% endif %}"
      {% if widget.div_id %}id="{{widget.div_id}}" data-valuecontainerid="form_{{widget.name}}"{% endif %}
@@ -27,7 +26,6 @@
     {% block widget-error %}{{widget.rendered_error}}{% endblock %}
     {% block widget-control %}{{widget.render_content|safe}}{% endblock %}
     {% block widget-hint %}{{widget.rendered_hint}}{% endblock %}
-    {% block widget-message %}{{widget.rendered_message}}{% endblock %}
   </div>
   {% endblock %}
   {% if widget.render_br %}
-- 
2.17.0