Changeset 2771 for WAeUP_SRP/base

Timestamp:

26 Nov 2007, 21:56:25 (17 years ago)

Author:

Henrik Bettermann

Message:

fixed

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -1474 +1474 @@
                 # the session string must not be copied into the level object
                 if student_rec.current_verdict and student_rec.current_level == level_id:
-                    level.getContent().edit(mapping={'verdict': "%s" % 
+                    level.getContent().edit(mapping={'verdict': "%s" %
                                                      student_rec.current_verdict,
-                                                     'session': "%s" % 
+                                                     'session': "%s" %
                                                      student_rec.current_session,
                                                     })
@@ -1756 +1756 @@
                 d['verdict']  = mapping.get('current_verdict','')
                 d['session']  = mapping.get('current_session','')
-                while d['session'] or d['verdict']:
+                current_level = mapping.get('current_level','')
+                while d['session'] and d['verdict'] and current_level:
                     sub_obj = getattr(student_obj,'study_course',None)
                     if sub_obj is None:
                         break
-                    level = getattr(sub_obj,mapping.get('current_level',None))
-                    if level is None:
+                    level_obj = getattr(sub_obj,current_level)
+                    if  level_obj is None:
                         break
-                    level.getContent().edit(mapping = d)
+                    level_obj.getContent().edit(mapping = d)
                     try:
-                        wftool.doActionFor(level,'close')
+                        wftool.doActionFor(level_obj,'close')
                     except:
                         pass