[gnue] r9104 - in trunk/gnue-forms/src: GFObjects input/displayHandlers

[reinhard]

Author: reinhard
Date: 2006-12-04 10:17:37 -0600 (Mon, 04 Dec 2006)
New Revision: 9104

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
   trunk/gnue-forms/src/input/displayHandlers/Cursor.py
Log:
Moved minimum length check to GFField.


Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2006-12-04 16:08:14 UTC (rev 
9103)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2006-12-04 16:17:37 UTC (rev 
9104)
@@ -321,6 +321,10 @@
                 if self.ltrim:
                     value = value.lstrip()
         
+            if self.minLength and value is not None and len(value) \
+                    and len(value) < self.field.minLength:
+                raise MinimumLengthError(self.name, value, self.minLength)
+
         # Auto-query support     
         if self._block.mode != 'query' \
                 and ((self.autoquery == 'Y') \
@@ -619,20 +623,32 @@
     """
     def __init__(self, field, value):
         errors.ApplicationError.__init__(self, u_(
-                    "Invalid database value %(value)r for field '%(field)s"
+                    "Invalid database value %(value)r for field '%(field)s'"
                 ) % {
                     'value': value,
                     'field': field})
 
 # =============================================================================
 
+class MinimumLengthError(errors.UserError):
+    def __init__(self, field, value, min_length):
+        errors.UserError.__init__(self, u_(
+                    "Value %(value)r for field '%(field)s' does not reach "
+                    "minimum length of %(min_length)s"
+                ) % {
+                    'field': field,
+                    'value': value,
+                    'min_length': min_length})
+
+# =============================================================================
+
 class InvalidFieldValueError(errors.UserError):
     """
     The user has provided an invalid value for a field.
     """
     def __init__(self, field, value):
         errors.UserError.__init__(self, u_(
-                    "Invalid value '%(value)s' for field '%(field)s"
+                    "Invalid value %(value)r for field '%(field)s'"
                 ) % {
                     'value': value,
                     'field': field})

Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-04 
16:08:14 UTC (rev 9103)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-04 
16:17:37 UTC (rev 9104)
@@ -49,13 +49,7 @@
           % {'value': value, 'field': field}
     errors.UserError.__init__ (self, msg)
 
-class MinimumLengthError(errors.UserError):
-  def __init__ (self, min_length):
-    msg = u_("Minimum required length %d") % min_length
-    errors.UserError.__init__(self, msg)
 
-
-
 # TODO: When Base is used inherit from that instead
 class BaseCursor(events.EventAware):
   """
@@ -724,8 +718,4 @@
       if not self._buildValue():
             raise InvalidFieldValueError(self.field.name, self.work)
 
-      if self.field.minLength and self.value is not None and len(self.value):
-          if len(self.value) < self.field.minLength:
-              raise MinimumLengthError(self.field.minLength)
-
       self.field.setValue(self.value)