Changeset 2754

Timestamp:

24 Nov 2007, 21:44:39 (17 years ago)

Author:

Henrik Bettermann

Message:

• session string from course result must not be imported into student_study_level object
• student_study_level object must be closed after import of verdict
• fix mass_create_course_result
• commit after 2000

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (5 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1444 +1444 @@
         course_id = mapping.get('code')
         if course_id not in self._v_courses.keys():
-            return '', "No course with ID: %s" % did
+            return '', "No course with ID: %s" % course_id
         id_key = ''
         for id_key in ('student_id','matric_no'):
@@ -1468 +1468 @@
                 level = getattr(context,"%(level_id)s" % mapping)
                 self.portal_workflow.doActionFor(level,'open')
-                level.getContent().edit(mapping={'session': "%(session_id)s" % mapping})
+
+                # the session string must not be copied into the level object
+                #level.getContent().edit(mapping={'session': "%(session_id)s" % mapping})
+
                 #self.portal_workflow.doActionFor(level,'close_for_edit')
             self._v_level_created += mapping['student_id'],
@@ -1690 +1693 @@
     security.declareProtected(ModifyPortalContent,'mass_edit_student') ###(
     def mass_edit_student(self,mapping):
+        wftool = self.portal_workflow
         "edit a students record due import"
         logger = logging.getLogger('WAeUPTool.mass_edit_student')
@@ -1746 +1750 @@
                         break
                     level.getContent().edit(mapping = d)
+                    try:
+                        wftool.doActionFor(level,'close')
+                    except:
+                        pass
                     break
             intersect = set(f2t[pt]['fields']).intersection(set(editable_keys))
@@ -1816 +1824 @@
         total = 0
         iname = "import_%s" % name
-        if iname == 'import_application':
+        if iname in ('import_application','import_course_result',):
             commit_after = 2000
         else: