Changeset 12261 for main

Timestamp:

19 Dec 2014, 08:14:25 (10 years ago)

Author:

Henrik Bettermann

Message:

Modify getWidgetsData so that we always get the same error format. Should also be changed in Kofa.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/tests/test_batching.py (modified) (1 diff)
• utils/converters.py (modified) (3 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py

@@ -268 +268 @@
             content,
             'reg_number,password,firstname,lastname,sex,phone,state,date_of_birth,customer_id,email,--ERRORS--\r\n'
-            '1,,Frank,Meyer,m,1234,,1990-01-06,F123456,aa@aa.ng,reg_number: reg_number\r\n'
+            '1,,Frank,Meyer,m,1234,,1990-01-06,F123456,aa@aa.ng,reg_number: Invalid input\r\n'
             '3,,Uli,Schulz,m,1234,,1990-01-07,A123456,aa@aa.ng,This object already exists. Skipping.\r\n'
 

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/converters.py

@@ -23 +23 @@
 from zope.formlib.boolwidgets import CheckBoxWidget
 from zope.formlib.form import (
-    _widgetKey, WidgetInputError, ValidationError, InputErrors, expandPrefix)
-from zope.formlib.interfaces import IInputWidget
+    _widgetKey, WidgetInputError, ValidationError, InputErrors,
+    expandPrefix)
+from zope.formlib.interfaces import IInputWidget, ConversionError
 from zope.interface import Interface
 from zope.publisher.browser import TestRequest
@@ -87 +88 @@
 
     This is merely a copy from the same-named function in
-    :mod:`zope.formlib.form`. The only difference is that we also
+    :mod:`zope.formlib.form`. The first difference is that we also
     store the fieldname for which a validation error happened in the
     returned error list (what the original does not do).
+    The second difference is that we return only ConversionError objects.
     """
     errors = []
@@ -104 +106 @@
                 data[name] = widget.getInputValue()
             except ValidationError, error:
-                # convert field ValidationError to WidgetInputError
-                error = WidgetInputError(widget.name, widget.label, error)
+                error = ConversionError(u'Validation failed')
                 errors.append((name, error))
-            except InputErrors, error:
+            except WidgetInputError, error:
+                error = ConversionError(u'Invalid input')
+                errors.append((name, error))
+            except ConversionError, error:
                 errors.append((name, error))