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

Timestamp:

1 Jun 2011, 13:38:51 (13 years ago)

Author:

uli

Message:

Add own getWidgetsDate function to retrieve bindings of errors to form
fields.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.py (modified) (2 diffs)

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

@@ -242 +242 @@
 from zope.interface import Interface
 from zope.formlib import form
+from zope.formlib.form import (
+    _widgetKey, WidgetInputError, ValidationError, InputErrors, expandPrefix)
 from zope.formlib.interfaces import IInputWidget
 from zope.publisher.browser import TestRequest
 
+def getWidgetsData(widgets, form_prefix, data):
+    # from zope.formlib.form
+    errors = []
+    form_prefix = expandPrefix(form_prefix)
+
+    for input, widget in widgets.__iter_input_and_widget__():
+        if input and IInputWidget.providedBy(widget):
+            name = _widgetKey(widget, form_prefix)
+
+            if not widget.hasInput():
+                continue
+
+            try:
+                data[name] = widget.getInputValue()
+            except ValidationError, error:
+                # convert field ValidationError to WidgetInputError
+                error = WidgetInputError(widget.name, widget.label, error)
+                errors.append((name, error))
+            except InputErrors, error:
+                errors.append((name, error))
+
+    return errors
+
+
 class DefaultConverter(Converter):
 
@@ -250 +276 @@
     grok.provides(ISchemaTypeConverter)
 
-    def __init__(self, iface):
+    def __init__(self, iface, form_fields=None):
         self.iface = iface
+        self.form_fields = form_fields
+        if self.form_fields is None:
+            self.form_fields = form.Fields(iface)
+        return
 
     def applyRowData(self, data_dict, context):
         request = TestRequest(form={})
-        form_fields = form.Fields(self.iface)
+        #form_fields = form.Fields(self.iface)
+        form_fields = self.form_fields
         for key, val in data_dict.items():
             request.form['form.%s' % key] = val
         widgets = form.setUpWidgets(
             form_fields, 'form', context, request)
-        errors = form.getWidgetsData(widgets, 'form', data_dict)
+        #errors = form.getWidgetsData(widgets, 'form', data_dict)
+        errors = getWidgetsData(widgets, 'form', data_dict)
+        if errors:
+            err_message = []
+            for key, error in errors:
+                message = error[1].args[0]
+                err_message.append((key, message))
         invariant_errors = form.checkInvariants(form_fields, data_dict)
         if not errors and not invariant_errors: