Implement SingleCheckboxBoolWidget with new chameleon template

plone · Jul 19, 2023 · 95d03a0 · 95d03a0
1 parent e3e5e89
commit 95d03a0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 94 deletions.
diff --git a/plone/app/z3cform/interfaces.py b/plone/app/z3cform/interfaces.py
@@ -1,6 +1,6 @@
 from plone.app.textfield.widget import IRichTextWidget as patextfield_IRichTextWidget
 from plone.schema.interfaces import IFormLayer
-from z3c.form.interfaces import IRadioWidget
+from z3c.form.interfaces import IRadioWidget as IBaseRadioWidget
 from z3c.form.interfaces import ISelectWidget as IBaseSelectWidget
 from z3c.form.interfaces import ISingleCheckBoxWidget
 from z3c.form.interfaces import ITextWidget as IBaseTextWidget
@@ -82,7 +82,7 @@ class ISingleCheckBoxBoolWidget(ISingleCheckBoxWidget):
     """Marker interface for the SingleCheckboxBoolWidget."""
 
 
-class IRadioWidget(IRadioWidget):
+class IRadioWidget(IBaseRadioWidget):
     """Radio widget."""
 
     def renderForValue(value):

diff --git a/plone/app/z3cform/templates/singlecheckboxbool_input.pt b/plone/app/z3cform/templates/singlecheckboxbool_input.pt
@@ -9,101 +9,19 @@
 >
   <div tal:condition="python:len(items) &gt; 0"
        tal:omit-tag="single_checkbox"
-       tal:attributes="
-         id view/id;
-       "
+       id="${view/id}"
   >
-    <div class="form-check"
+    <div class="form-check" id="${python:view.id if single_checkbox else None}"
          tal:repeat="item items"
-         tal:attributes="
-           id python:single_checkbox and view.id or None;
-         "
     >
-      <input class=""
-             id=""
-             accesskey=""
-             alt=""
-             checked="checked"
-             name=""
-             tabindex=""
-             title=""
-             type="checkbox"
-             value=""
-             tal:condition="item/checked"
-             tal:attributes="
-               id item/id;
-               name item/name;
-               required python:view.required and 'required' or None;
-               class string:form-check-input ${view/klass};
-               value item/value;
-               style view/style;
-               title view/title;
-               lang view/lang;
-               onclick view/onclick;
-               ondblclick view/ondblclick;
-               onmousedown view/onmousedown;
-               onmouseup view/onmouseup;
-               onmouseover view/onmouseover;
-               onmousemove view/onmousemove;
-               onmouseout view/onmouseout;
-               onkeypress view/onkeypress;
-               onkeydown view/onkeydown;
-               onkeyup view/onkeyup;
-               disabled view/disabled;
-               tabindex view/tabindex;
-               onfocus view/onfocus;
-               onblur view/onblur;
-               onchange view/onchange;
-               readonly view/readonly;
-               alt view/alt;
-               accesskey view/accesskey;
-               onselect view/onselect;
-             "
-      /><input class=""
-             id=""
-             accesskey=""
-             alt=""
-             name=""
-             tabindex=""
-             title=""
-             type="checkbox"
-             value=""
-             tal:condition="not:item/checked"
-             tal:attributes="
-               id item/id;
-               name item/name;
-               required python:view.required and 'required' or None;
-               class string:form-check-input ${view/klass};
-               value item/value;
-               style view/style;
-               title view/title;
-               lang view/lang;
-               onclick view/onclick;
-               ondblclick view/ondblclick;
-               onmousedown view/onmousedown;
-               onmouseup view/onmouseup;
-               onmouseover view/onmouseover;
-               onmousemove view/onmousemove;
-               onmouseout view/onmouseout;
-               onkeypress view/onkeypress;
-               onkeydown view/onkeydown;
-               onkeyup view/onkeyup;
-               disabled view/disabled;
-               tabindex view/tabindex;
-               onfocus view/onfocus;
-               onblur view/onblur;
-               onchange view/onchange;
-               readonly view/readonly;
-               alt view/alt;
-               accesskey view/accesskey;
-               onselect view/onselect;
-             "
-      />
+      <input type="checkbox"
+             name="${view/name}"
+             value="${view/value}"
+             checked="${python:'checked' if item['checked'] else None}"
+             tal:attributes="view/attributes"
+             />
       <label class="form-check-label"
-             for=""
-             tal:attributes="
-               for item/id;
-             "
+             for="${item/id}"
       >
         <span tal:content="item/label">Label</span>
         <span class="required horizontal"

diff --git a/plone/app/z3cform/widgets/singlecheckbox.py b/plone/app/z3cform/widgets/singlecheckbox.py
@@ -18,7 +18,7 @@
 class SingleCheckBoxBoolWidget(SingleCheckBoxWidget):
     """Single Input type checkbox widget implementation."""
 
-    klass = "single-checkbox-bool-widget"
+    klass = "single-checkbox-bool-widget form-check-input"
 
     @property
     def label(self):