Changeset 7411

Timestamp:

20 Dec 2011, 12:35:01 (13 years ago)

Author:

uli

Message:

Fix case where phonewidget itself does not require input.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/widgets/phonewidget.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/widgets/phonewidget.py

@@ -36 +36 @@
 from zope.component import getMultiAdapter
 from zope.formlib import form
-from zope.formlib.interfaces import IBrowserWidget, IWidgetInputErrorView
-from zope.formlib.interfaces import IInputWidget, WidgetInputError
+from zope.formlib.interfaces import (
+    IBrowserWidget, IWidgetInputErrorView, IInputWidget, WidgetInputError,
+    MissingInputError)
 from zope.formlib.widget import SimpleInputWidget
 from zope.interface import Interface, implements
+from zope.schema.interfaces import RequiredMissing
 
 class IPhoneData(Interface):
@@ -171 +173 @@
             raise self._error
         except WidgetInputError, e:
+            # Subwidgets require input. We have to work around that if
+            # the parent widget does not require input.
+            missing = isinstance(e.errors, RequiredMissing)
+            missing = missing or isinstance(e, MissingInputError)
+            if not self.required and missing:
+                return self._missing
             self._error = e
             raise e