From f92f1c81233994ddeaf479869f2f87bbd6a2cf53 Mon Sep 17 00:00:00 2001
From: Elias Showk <eshowk@entrouvert.com>
Date: Wed, 25 Apr 2018 15:56:33 +0200
Subject: [PATCH] create template for CheckboxesWidget (#23413)

---
 wcs/qommon/form.py                            | 22 -------------------
 .../qommon/forms/widgets/checkboxes.html      | 17 ++++++++++++++
 2 files changed, 17 insertions(+), 22 deletions(-)
 create mode 100644 wcs/qommon/templates/qommon/forms/widgets/checkboxes.html

diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index 49df467e..4e02888e 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -1109,28 +1109,6 @@ class CheckboxesWidget(CompositeWidget):
     def has_error(self, request=None):
         return Widget.has_error(self, request=request)
 
-    def render_content(self):
-        r = TemplateIO(html=True)
-        if self.inline:
-            r += htmltext('<ul class="inline">')
-        else:
-            r += htmltext('<ul>')
-        for widget in self.get_widgets():
-            if widget.attrs and 'disabled' in widget.attrs:
-                r += htmltext('<li class="disabled"><label>')
-            else:
-                r += htmltext('<li><label>')
-            if self.readonly:
-                widget.attrs['disabled'] = 'disabled'
-                if widget.value:
-                    r += htmltext('<input type="hidden" name="%s" value="yes" >') % widget.name
-                widget.name = widget.name + 'xx'
-            r += widget.render_content()
-            r += htmltext('<span>%s</span>') % widget.title
-            r += htmltext('</label>')
-            r += htmltext('</li>')
-        r += htmltext('</ul>')
-        return r.getvalue()
 
 class ValidatedStringWidget(StringWidget):
     '''StringWidget which checks the value entered is correct according to a regex'''
diff --git a/wcs/qommon/templates/qommon/forms/widgets/checkboxes.html b/wcs/qommon/templates/qommon/forms/widgets/checkboxes.html
new file mode 100644
index 00000000..fe9d1eb3
--- /dev/null
+++ b/wcs/qommon/templates/qommon/forms/widgets/checkboxes.html
@@ -0,0 +1,17 @@
+{% extends "qommon/forms/widget.html" %}
+{% block widget-control %}
+<ul {% if widget.inline %}class="inline"{% endif %}>
+  {% for w in widget.get_widgets %}
+    <li {% if "disabled" in w.attrs %}class="disabled"{% endif %}>
+        {% if widget.readonly and w.value %}
+          <input type="hidden" name="{{ w.name }}" value="{{ yes }}">
+        {% endif %}
+      <label><input name="{{w.name}}{% if widget.readonly %}xx{% endif %}"
+              value="yes" type="checkbox"
+              {% if widget.readonly or "disabled" in w.attrs %}disabled{% endif %}
+              {% if w.value %}checked{% endif %}
+              ><span>{{ w.title }}</span></label>
+    </li>
+  {% endfor %}
+</ul>
+{% endblock %}
\ No newline at end of file
-- 
2.17.0