Changeset 7846

Timestamp:

12 Mar 2012, 13:06:45 (13 years ago)

Author:

uli

Message:

Error handling with new phonewidget works better now. Still a sketch
and test errors to fix.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/widgets/phonewidget.py (modified) (4 diffs)

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

@@ -249 +249 @@
 
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
-from zope.formlib.textwidgets import TextWidget, renderElement
+from zope.formlib.textwidgets import (
+    TextWidget, renderElement, ConversionError)
+from zope.formlib.widget import ValidationError
 from zope.component import getUtility
 from zope.interface import Invalid
-from zope.formlib.interfaces import WidgetInputError, MissingInputError
+from zope.formlib.interfaces import (
+    WidgetInputError, MissingInputError, InputErrors,)
+from zope.schema.interfaces import RequiredMissing
+from waeup.kofa.interfaces import MessageFactory as _
 
 class IInternationalPhonePrefixes(Interface):
@@ -259 +264 @@
 
 INT_PHONE_PREFIXES = {
-        'Germany': '49',
-        'Nigeria': '234',
-        'U.S.': '1',
+        _('Germany'): '49',
+        _('Nigeria'): '234',
+        _('U.S.'): '1',
         }
 
@@ -273 +278 @@
                        for x,y in self._data])
 
+RE_NUMBERS = re.compile('^\d+$')
+RE_NUMBERS_AND_HYPHENS = re.compile('^[\d\-]+$')
+
 class PhoneWidget2(TextWidget):
 
     subwidget_names = ('country', 'area', 'ext')
-
-    #_missing = '--'
 
     def _renderPrefixWidget(self, value):
@@ -340 +346 @@
         """
         result = '-'.join(
-            [self.request.get('%s.%s' % (self.name, name))
+            [self.request.get('%s.%s' % (self.name, name), '')
              for name in self.subwidget_names])
         return result
 
+    def _toFieldValue(self, input):
+        """Check value entered in form further.
+
+        Raises ConversionError if values entered contain non-numbers.
+
+        For the extension line we silently allow slashes as well.
+        """
+        result = super(PhoneWidget2, self)._toFieldValue(input)
+        parts = input.split('-', 2)
+        if '' in parts and self.context.required:
+            raise ConversionError(
+                _("Empty phone field(s)."), MissingInputError(
+                self.name, self.label, None))
+        if not RE_NUMBERS.match(parts[1]) or not RE_NUMBERS_AND_HYPHENS.match(
+            parts[2]):
+            raise ConversionError(
+                _("Phone numbers may contain numbers only."),
+                ValueError('non numbers in phone number'))
+        return result
+
+    def _getFormValue(self):
+        """Returns a value suitable for use in an HTML form.
+
+        Detects the status of the widget and selects either the input value
+        that came from the request, the value from the _data attribute or the
+        default value.
+        """
+        try:
+            input_value = self._getCurrentValueHelper()
+        except InputErrors:
+            form_value = '-'.join(
+                [self.request.form.get('%s.%s' % (self.name, name), '')
+                 for name in self.subwidget_names]
+                )
+            if form_value == '--':
+                form_value = self._missing
+        else:
+            form_value = self._toFormValue(input_value)
+        return form_value
+
     def hasInput(self):
+        """A phone widget has input if all three subfields have input.
+        """
         for name in self.subwidget_names:
             if '%s.%s' % (self.name, name) not in self.request.form:
                 return False
         return True
+