Bugfix: The ChoiceTerms adapter blindly assumed that the passed i…

…n field

is unbound, which is not necessarily the case in interesting ObjectWidget
scenarios. Not it checks for a non-None field context first. [srichter]

CHANGES.txt

@@ -9,6 +9,9 @@ CHANGES
 
 - CheckBoxWidget items are better determined when they are needed [agroszer]
 
+- Bugfix: The ``ChoiceTerms`` adapter blindly assumed that the passed in field
+  is unbound, which is not necessarily the case in interesting ObjectWidget
+  scenarios. Not it checks for a non-None field context first. [srichter]
 
 3.2.9 (2016-02-01)
 ------------------

src/z3c/form/term.py

@@ -101,7 +101,8 @@ def __contains__(self, value):
     zope.schema.interfaces.IChoice,
     interfaces.IWidget)
 def ChoiceTerms(context, request, form, field, widget):
-    field = field.bind(context)
+    if field.context is None:
+        field = field.bind(context)
     terms = field.vocabulary
     return zope.component.queryMultiAdapter(
         (context, request, form, field, terms, widget),