Changeset 7848

Timestamp:

12 Mar 2012, 16:18:29 (13 years ago)

Author:

uli

Message:

• Require format +NNN-NNN-NNNN for phone data.

• Fix missing_value behaviour.

File:

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

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

@@ -275 +275 @@
 
     def title_value_list(self):
-        return sorted([('%s (+%s)' % (x,y), y)
+        return sorted([('%s (+%s)' % (x,y), '+%s' % y)
                        for x,y in self._data])
 
+RE_INT_PREFIX = re.compile('^\+\d+')
 RE_NUMBERS = re.compile('^\d+$')
 RE_NUMBERS_AND_HYPHENS = re.compile('^[\d\-]+$')
@@ -363 +364 @@
                 _("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]):
+        if parts[0] != '' and not RE_INT_PREFIX.match(parts[0]):
+            raise ConversionError(
+                _("Int. prefix requires format '+NNN'"),
+                ValueError('invalid international prefix'))
+        if (parts[1] != '' and not RE_NUMBERS.match(parts[1])) or (
+            parts[2] != '' and not RE_NUMBERS_AND_HYPHENS.match(
+            parts[2])):
             raise ConversionError(
                 _("Phone numbers may contain numbers only."),
                 ValueError('non numbers in phone number'))
+        if result in ('--', '', None):
+            result = self.context.missing_value
         return result
 
@@ -384 +392 @@
                  for name in self.subwidget_names]
                 )
-            if form_value == '--':
-                form_value = self._missing
         else:
             form_value = self._toFormValue(input_value)
@@ -397 +403 @@
                 return False
         return True
-