Changeset 12414 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

8 Jan 2015, 07:01:26 (10 years ago)

Author:

Henrik Bettermann

Message:

Validate all codes in Kofa.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• university/interfaces.py (modified) (5 diffs)
• utils/batching.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -166 +166 @@
     return True
 
+# Define a validation method for ids
+class NotIdValue(schema.ValidationError):
+    __doc__ = u"Invalid id"
+
+#: Regular expressions to check id formats.
+check_id = re.compile(r"^[a-zA-Z0-9_-]{2,6}$").match
+
+def validate_id(value):
+    if not check_id(value):
+        raise NotIdValue(value)
+    return True
+
 # Define a validation method for international phone numbers
 class InvalidPhoneNumber(schema.ValidationError):

main/waeup.kofa/trunk/src/waeup/kofa/university/interfaces.py

@@ -21 +21 @@
 from zope import schema
 from zope.interface import Attribute, invariant, Invalid
-from waeup.kofa.interfaces import (IKofaObject, IKofaContainer)
+from waeup.kofa.interfaces import IKofaObject, IKofaContainer, validate_id
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.university.vocabularies import (
@@ -39 +39 @@
         default = u'NA',
         required = True,
+        constraint=validate_id,
         )
 
@@ -69 +70 @@
         default = u'NA',
         required = True,
+        constraint=validate_id,
         )
 
@@ -112 +114 @@
         default = u'NA',
         required = True,
+        constraint=validate_id,
         )
 
@@ -156 +159 @@
         default = u'NA',
         required = True,
+        constraint=validate_id,
         )
 

main/waeup.kofa/trunk/src/waeup/kofa/utils/batching.py

@@ -271 +271 @@
         errs, inv_errs, conv_dict =  converter.fromStringDict(
             row, self.factory_name, mode=mode)
-        if 'code' in row and ' ' in row['code']:
-            errs.append(('code','must not contain spaces'))
         return errs, inv_errs, conv_dict