Changeset 1991

Timestamp:

5 Jul 2007, 13:30:57 (17 years ago)

Author:

Henrik Bettermann

Message:

fixed

File:

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

WAeUP_SRP/trunk/WAeUPTool.py

@@ -1 @@
-3#-*- mode: python; mode: fold -*-
+#-*- mode: python; mode: fold -*-
 # (C) Copyright 2005 The WAeUP group  <http://www.waeup.org>
 # Author: Joachim Schmitz (js@aixtraware.de)
@@ -277 +277 @@
         if entry_session == self.getSessionId()[-2:]:
             wfaction = 'admit'
-            wft = 'wf_transition_admitted'
+            wft = 'wf_transition_admit'
             password = None
         else:
             wfaction = 'return'
-            wft = 'wf_transition_returning'
+            wft = 'wf_transition_return'
             password = self.generatePassword()
             self.makeStudentMember(sid,password)
@@ -747 +747 @@
                           {'id': 'application',
                            'title': 'Application Data',
-                           'wf_transition_returning': 'close',
-                           'wf_transition_admitted': 'remain',
+                           'wf_transition_return': 'close',
+                           'wf_transition_admit': 'remain',
                            'fields':
                              ('jamb_reg_no',
@@ -760 +760 @@
                       #    {'id': 'pume',
                       #     'title': 'Pume Data',
-                      #     'wf_transition_returning': 'close',
-                      #     'wf_transition_admitted': 'close',
+                      #     'wf_transition_return': 'close',
+                      #     'wf_transition_admit': 'close',
                       #     'fields':
                       #       ('pume_score',
@@ -769 +769 @@
                           {'id': 'clearance',
                            'title': 'Clearance Data',
-                           'wf_transition_returning': 'close',
-                           'wf_transition_admitted': 'remain',
+                           'wf_transition_return': 'close',
+                           'wf_transition_admit': 'remain',
                            'fields':
                              ('matric_no',
@@ -781 +781 @@
                           {'id': 'personal',
                            'title': 'Personal Data',
-                           'wf_transition_returning': 'open',
-                           'wf_transition_admitted': 'remain',
+                           'wf_transition_return': 'open',
+                           'wf_transition_admit': 'remain',
                            'fields':
                              ('firstname',
@@ -796 +796 @@
                           {'id': 'study_course',
                            'title': 'Study Course',
-                           'wf_transition_returning': 'open',
-                           'wf_transition_admitted': 'remain',
+                           'wf_transition_return': 'open',
+                           'wf_transition_admit': 'remain',
                            'fields':
                              ('study_course',
@@ -810 +810 @@
                           {'id': 'payments',
                            'title': 'Payments',
-                           'wf_transition_returning': 'open',
-                           'wf_transition_admitted': 'open',
+                           'wf_transition_return': 'open',
+                           'wf_transition_admit': 'open',
                            'fields':
                              ()
@@ -937 +937 @@
         # included only to change wf state from admitted to returning
             if res[0].review_state == 'admitted':
-                new_state = f2t[pt]['wf_transition_returning']
+                new_state = f2t[pt]['wf_transition_return']
                 sub_obj = getattr(student_obj,f2t[pt]['id'],None)
                 if sub_obj and new_state != "remain":