Changeset 7883

Timestamp:

14 Mar 2012, 17:18:39 (13 years ago)

Author:

uli

Message:

In phonewidget consider *-- as missing value.

Location:

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

Files:

• phonewidget.py (modified) (1 diff)
• tests/test_phonewidget.py (modified) (1 diff)

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

@@ -127 +127 @@
                 _("Phone numbers may contain numbers only."),
                 ValueError('non numbers in phone number'))
-        if result in ('--', '', None):
+        # We consider also values ending with '--' as missing values.
+        # This means that any prefix setting in the form will switch
+        # back to default upon submit if no further phone fields are filled.
+        # As advantage we get only valid phone numbers or missing value.
+        if result in ('', None) or result.endswith('--'):
             result = self.context.missing_value
         return result

main/waeup.kofa/trunk/src/waeup/kofa/widgets/tests/test_phonewidget.py

@@ -143 +143 @@
         self.assertEqual(content.baz, None)
         return
+
+    def test_partial_values(self):
+        content = SampleContent()
+        request = TestRequest()
+
+        request.form['form.foo.country'] = u'+123'
+        request.form['form.foo.area'] = u'456'
+        request.form['form.foo.ext'] = u''
+        request.form['form.bar.country'] = u'+123'
+        request.form['form.bar.area'] = u''
+        request.form['form.bar.ext'] = u'789'
+        request.form['form.baz.country'] = u'+123'
+        request.form['form.baz.area'] = u'456'
+        request.form['form.baz.ext'] = u'789'
+        request.form['form.actions.apply'] = u''
+
+        SampleForm(content, request)()
+
+        # check new values in object
+        self.assertEqual(content.foo, None)
+        self.assertEqual(content.bar, 'bar') # input error, no value was set
+        self.assertEqual(content.baz, None)
+        return
+
+    def test_no_values(self):
+        # if the last two subfields contain no value, no phone will be set
+        content = SampleContent()
+        request = TestRequest()
+
+        request.form['form.bar.country'] = u'+123'
+        request.form['form.bar.area'] = u''
+        request.form['form.bar.ext'] = u''
+        request.form['form.baz.country'] = u'+124'
+        request.form['form.baz.area'] = u''
+        request.form['form.baz.ext'] = u''
+        request.form['form.actions.apply'] = u''
+
+        SampleForm(content, request)()
+
+        # check new values in object
+        self.assertEqual(content.bar, u'') # default missing value
+        self.assertEqual(content.baz, None)
+        return