Changeset 7439 for main/waeup.sirp/trunk/src/waeup/sirp

Timestamp:

23 Dec 2011, 10:49:11 (13 years ago)

Author:

uli

Message:

Provide a better fix for the required field problem of
phonewidget. There are still issues with default values left open.

File:

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

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

@@ -30 +30 @@
 """
 import re
+import copy
 from waeup.sirp import MessageFactory as _
 from zope import schema
@@ -66 +67 @@
         constraint=re.compile(r'^[0-9]{3,}$').search,
         required=True)
-
 
 class PhoneWidgetData(object):
@@ -129 +129 @@
         """
         value = self.context.query(self.context.context)
-        adapters = {}
-        adapters[IPhoneData] = PhoneWidgetData(self, value)
+        # we have to modify the adapter according to our own
+        # 'required' state. Some ugly workaround
+        adapter = copy.deepcopy(IPhoneData)
+        for name in 'country', 'area', 'extension':
+            adapter[name].required = self.required
+        adapters = {adapter: PhoneWidgetData(self, value)}
         self.widgets = form.setUpEditWidgets(
             form.FormFields(IPhoneData),
@@ -164 +168 @@
         self._error = None
         try:
-            return u'-'.join((
+            result = u'-'.join((
                 self.widgets['country'].getInputValue(),
                 self.widgets['area'].getInputValue(),
                 self.widgets['extension'].getInputValue() ))
+            return result
+        except TypeError:
+            if self.required:
+                return self._missing
+            return None
         except ValueError, v:
             self._error = WidgetInputError(
@@ -173 +182 @@
             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