Merge pull request #192 from plone/autoform-widget-factory

Fix `SelectFieldWidget` factory call from `plone.autoform`

news/192.bugfix

@@ -0,0 +1,2 @@
+Fix `SelectFieldWidget` factory call.
+[petschki]

plone/app/z3cform/tests/test_widgets.py

@@ -571,17 +571,19 @@ def setUp(self):
  self.request = self.layer["request"]
 
  def test_select_widget(self):
+ from plone.app.z3cform.widgets.select import SelectFieldWidget
  from plone.app.z3cform.widgets.select import SelectWidget
 
- widget = SelectWidget(self.request)
- widget.id = "test-widget"
- widget.name = "selectfield-widget"
- widget.field = Choice(
+ field = Choice(
  __name__="selectfield",
  values=["one", "two", "three"],
+ required=True,
  )
- widget.terms = widget.field.vocabulary
- widget.field.required = True
+ widget = SelectFieldWidget(field, self.request)
+ widget.id = "test-widget"
+ widget.name = "selectfield-widget"
+ widget.terms = field.vocabulary
+ self.assertTrue(isinstance(widget, SelectWidget))
  self.assertEqual(
  {
  "pattern_options": {},

plone/app/z3cform/widgets/select.py

@@ -34,14 +34,16 @@ class SelectWidget(HTMLSelectWidget, SelectWidgetBase):
 
 
 @implementer(IFieldWidget)
-def SelectFieldWidget(field, source, request):
+def SelectFieldWidget(field, request, extra=None):
+ if extra is not None:
+ request = extra
  return FieldWidget(field, SelectWidget(request))
 
 
 @implementer(IFieldWidget)
 def CollectionChoiceSelectFieldWidget(field, value_type, request):
  """IFieldWidget factory for SelectWidget."""
- return SelectFieldWidget(field, None, request)
+ return SelectFieldWidget(field, request)
 
 
 @implementer_only(ISelect2Widget)