Changeset 5965

Timestamp:

08/31/2010 06:01:52 AM (1 year ago)

Author:

ed

Message:

Added some logic to prevent infinite loops when using field-level validation.

Files:

• trunk/dabo/ui/uiwx/dForm.py (modified) (3 diffs)
• trunk/dabo/ui/uiwx/dPemMixin.py (modified) (1 diff)

trunk/dabo/ui/uiwx/dForm.py

@@ -56 +56 @@
-        # Holds the dataSource passed to the method
-        self.dataSourceParameter = None
+        # Flag to prevent infinite loops when doing field-level validation
+        self._fieldValidationControl = None
-
-
@@ -775 +777 @@
-        can then respond to this.
-        """
+        if self._fieldValidationControl:
+            # Prevent infinite loops
+            return
-        ds = ctrl.DataSource
-        df = ctrl.DataField
@@ -810 +815 @@
-        self.StatusText = _(u"Validation failed for %(df)s: %(err)s") % locals()
-        dabo.ui.callAfter(ctrl.setFocus)
+        self._fieldValidationControl = ctrl
+
+
+    def _controlGotFocus(self, ctrl):
+        if self._fieldValidationControl is ctrl:
+            # Clear it
+            self._fieldValidationControl = None
-        
-    

trunk/dabo/ui/uiwx/dPemMixin.py

@@ -555 +555 @@
-        
-    def __onWxGotFocus(self, evt):
+        self.Form._controlGotFocus(self)
-        self._pushStatusText()
-        if isinstance(self, dabo.ui.dGrid):