Changeset 8490

Timestamp:

22 May 2012, 08:02:09 (13 years ago)

Author:

uli

Message:

Let conversion checks for student imports reset the student id counter.

Location:

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

Files:

• batching.py (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)

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

@@ -259 +259 @@
                 # be changed if empty
                 conv_dict['state'] = IGNORE_MARKER
+
+        try:
+            # Correct stud_id counter. As the IConverter for students
+            # creates student objects that are not used afterwards, we
+            # have to fix the site-wide student_id counter.
+            site = grok.getSite()
+            students = site['students']
+            students._curr_stud_id -= 1
+        except (KeyError, TypeError, AttributeError):
+                pass
         return errs, inv_errs, conv_dict
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py

@@ -322 +322 @@
 
     def test_checkConversion(self):
+        # Make sure we can check conversions and that the stud_id
+        # counter is not raised during such checks.
+        initial_stud_id = self.app['students']._curr_stud_id
         errs, inv_errs, conv_dict = self.processor.checkConversion(
             dict(reg_number='1', state='admitted'))
@@ -334 +337 @@
         self.assertEqual(len(errs),1)
         self.assertTrue(('state', 'not allowed') in errs)
+        new_stud_id = self.app['students']._curr_stud_id
+        self.assertEqual(initial_stud_id, new_stud_id)
+        return
 
     def test_delEntry(self):