[Checkins] SVN: plone.z3cform/trunk/ Fix obvious bugs and dodgy naming in SingleCheckBoxWidget.

[Martin Aspeli]

Log message for revision 98351:
  Fix obvious bugs and dodgy naming in SingleCheckBoxWidget.

Changed:
  U   plone.z3cform/trunk/docs/HISTORY.txt
  U   plone.z3cform/trunk/plone/z3cform/widget.py

-=-
Modified: plone.z3cform/trunk/docs/HISTORY.txt
===================================================================
--- plone.z3cform/trunk/docs/HISTORY.txt	2009-03-25 04:46:19 UTC (rev 98350)
+++ plone.z3cform/trunk/docs/HISTORY.txt	2009-03-25 05:02:25 UTC (rev 98351)
@@ -4,6 +4,9 @@
 0.5.4 - unreleased
 ------------------
 
+* Fix obvious bugs and dodgy naming in SingleCheckBoxWidget.
+  [optilude]
+
 * Use chameleon-based page templates from five.pt if available.
   [davisagli]
 

Modified: plone.z3cform/trunk/plone/z3cform/widget.py
===================================================================
--- plone.z3cform/trunk/plone/z3cform/widget.py	2009-03-25 04:46:19 UTC (rev 98350)
+++ plone.z3cform/trunk/plone/z3cform/widget.py	2009-03-25 05:02:25 UTC (rev 98351)
@@ -1,18 +1,21 @@
-from zope import interface
 from zope.schema import vocabulary
 
+import zope.interface
+import zope.component
+import zope.schema.interfaces
+
 import z3c.form.term
 import z3c.form.browser.checkbox
 import z3c.form.interfaces
 
-class SingleCheckboxWidget(z3c.form.browser.checkbox.SingleCheckBoxWidget):
+class SingleCheckBoxWidget(z3c.form.browser.checkbox.SingleCheckBoxWidget):
     """XXX: We need to refactor this and patch z3c.form where
     it makes sense.
     """
 
     def update(self):
         self.ignoreContext = True
-        super(SingleCheckboxWidget, self).update()
+        super(SingleCheckBoxWidget, self).update()
 
     def updateTerms(self):
         # The default implementation would render "selected" as a
@@ -31,12 +34,15 @@
             return default
         else:
             try:
-                return super(SingleCheckboxWidget, self).extract(default, setErrors=setErrors)
+                return super(SingleCheckBoxWidget, self).extract(default, setErrors=setErrors)
             except TypeError:
                 # for z3c.form <= 1.9.0
-                return super(SingleCheckboxWidget, self).extract(default)
+                return super(SingleCheckBoxWidget, self).extract(default)
 
- at interface.implementer(z3c.form.interfaces.IDataConverter)
-def singlecheckboxwidget_factory(field, request):
-    widget = SingleCheckboxWidget(request)
-    return z3c.form.widget.FieldWidget(field, widget)
+ at zope.component.adapter(zope.schema.interfaces.IBool, z3c.form.interfaces.IFormLayer)
+ at zope.interface.implementer(z3c.form.interfaces.IFieldWidget)
+def SingleCheckBoxFieldWidget(field, request):
+    return z3c.form.widget.FieldWidget(field, SingleCheckBoxWidget(request))
+    
+# BBB:
+singlecheckboxwidget_factory = SingleCheckBoxFieldWidget
\ No newline at end of file