Changeset 8540

Timestamp:

29 May 2012, 06:22:11 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix emergency fix. Due to this bug I recovered that generate_applicant_id generates duplicate keys.

Location:

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

Files:

• applicants/container.py (modified) (1 diff)
• applicants/interfaces.py (modified) (1 diff)
• utils/batching.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/container.py

@@ -31 +31 @@
 def generate_applicant_id(container=None):
     if container is not None:
-        aid = u"%s_%d" % (container.code, r().randint(99999,1000000))
-        while aid in container.keys():
-            aid = u"%s_%d" % (container.code, r().randint(99999,1000000))
-        return aid
+        key = r().randint(99999,1000000)
+        while key in container.keys():
+            key = r().randint(99999,1000000)
+        return u"%s_%d" % (container.code, key)
     else:
         # In some tests we don't use containers

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

@@ -349 +349 @@
     date_of_birth = FormattedDate(
         title = _(u'Date of Birth'),
-        required = True,
+        required = False,
         #date_format = u'%d/%m/%Y', # Use grok-instance-wide default
         show_year = True,

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

@@ -347 +347 @@
                         failed_writer, string_row,
                         "%s Skipping." % error.message)
+                    continue
                 except DuplicationError, error:
                     num_warns += 1