Changeset 7671 for main

Timestamp:

20 Feb 2012, 08:56:44 (13 years ago)

Author:

Henrik Bettermann

Message:

Use workflow state constants instead of strings in students components.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (1 diff)
• student.py (modified) (2 diffs)
• viewlets.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -1438 +1438 @@
 
     def update(self, SUBMIT=None):
-        if not self.context.state == 'admitted':
+        if not self.context.state == ADMITTED:
             self.flash("Wrong state.")
             self.redirect(self.url(self.context))

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -28 +28 @@
 from waeup.sirp.interfaces import (
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
-    ISIRPUtils)
+    ISIRPUtils, CLEARANCE)
 from waeup.sirp.image import SIRPImageFile
 from waeup.sirp.imagestorage import DefaultFileStoreHandler
@@ -147 +147 @@
     """
     reg_state = IWorkflowState(student).getState()
-    if reg_state == 'clearance started':
+    if reg_state == CLEARANCE:
         student.clearance_locked = False
     else:

main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py

@@ -369 +369 @@
     @property
     def target_url(self):
-        if self.context.state != 'admitted':
+        if self.context.state != ADMITTED:
             return ''
         return self.view.url(self.view.context, self.target)
@@ -384 +384 @@
     @property
     def target_url(self):
-        if self.context.state != 'admitted':
+        if self.context.state != ADMITTED:
             return ''
         return self.view.url(self.view.context, self.target)
@@ -428 +428 @@
     def target_url(self):
         student = self.view.context.getStudent()
-        condition1 = student.state != 'school fee paid'
+        condition1 = student.state != PAID
         condition2 = str(student['studycourse'].current_level) in \
             self.view.context.keys()
@@ -446 +446 @@
     def target_url(self):
         student = self.view.context.getStudent()
-        condition1 = student.state != 'school fee paid'
+        condition1 = student.state != PAID
         condition2 = student[
             'studycourse'].current_level != self.view.context.level