Changeset 1990

Timestamp:

5 Jul 2007, 11:34:41 (17 years ago)

Author:

Henrik Bettermann

Message:

see comment in ticket #300 (untested)

File:

• WAeUP_SRP/trunk/WAeUPTool.py (modified) (3 diffs)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -842 +842 @@
         if mapping.get('sex'):
             d['jamb_sex']  = 'F'
+        transition = mapping.get('reg_transition','admit')
+        if transition not in ('admit','return'):
+            transition = 'admit'        
         for pt in f2t.keys():
             student_obj.invokeFactory(pt,f2t[pt]['id'])
@@ -855 +858 @@
                         d[zu] = mapping[von]
             sub_doc.edit(mapping = d)
-            transition = mapping.get('reg_transition','admitted')
-            if transition not in ('admitted','returning'):
-                transition = 'admitted'
+
             #import pdb;pdb.set_trace()
             new_state = f2t[pt]['wf_transition_%(transition)s' % vars()]
             if new_state != "remain":
                 self.portal_workflow.doActionFor(sub_obj,new_state,dest_container=sub_obj)
-        wfaction = 'admit'
-        self.portal_workflow.doActionFor(student_obj,wfaction)
+        self.portal_workflow.doActionFor(student_obj,transition)
         student_obj.manage_setLocalRoles(sid, ['Owner',])
         return sid,''
@@ -901 +901 @@
         if res[0].review_state != 'admitted':
             return '%s' % res[0].id ,"student is not in state admitted"
-        # end inclusion    
+        # end inclusion
 
         sid = res[0].id