Changeset 6301 for main/waeup.sirp/trunk/src

Timestamp:

8 Jun 2011, 21:17:42 (14 years ago)

Author:

Henrik Bettermann

Message:

Do not define workflow states as attributes. We will use the workflow adapters in views directly.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• applicants.py (modified) (1 diff)
• interfaces.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicants.py

@@ -48 +48 @@
         super(Applicant, self).__init__()
         #Initialize workflow state...
-        self.setApplicationState('initialized')
-
-    def getApplicationState(self):
-        return IWorkflowState(self).getState()
-
-    def setApplicationState(self, state=None):
-        """Try to set new state.
-
-        Instead of simply setting a value, we fire a transition of a
-        workflow. This might fail if, for instance, the required state
-        is not part of the workflow or unreachable from current state.
-        """
-        if state == self.getApplicationState():
-            # Accept staying in the same state, even if workflow does
-            # not allow this.
-            return
-        info = IWorkflowInfo(self)
-        info.fireTransitionToward(state)
-        return
-
-    #application_state = property(getApplicationState, setApplicationState)
+        IWorkflowInfo(self).fireTransition('init')
 
 # Set all attributes of Applicant required in IApplicant as field

main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

@@ -367 +367 @@
         readonly = True,
         )
-
-    #application_state = schema.Choice(
-    #    title = u'Application Status',
-    #    default = 'created',
-    #    values = ['unchecked', 'checked']
-    #    readonly = True,
-    #    )
-
     screening_score = schema.Int(
         title = u'Screening Score',
@@ -419 +411 @@
     omit fields. This has to be done in the respective form page.
     """
+    application_state = Attribute("The workflow state of an applicant object.")
+
     screening_score = schema.Int(
         title = u'Screening Score',
@@ -429 +423 @@
         readonly = True,
         )
-    course_admitted = schema.TextLine(
-        # XXX: should be choice
+    course_admitted = schema.Choice(
         title = u'Admitted Course of Study',
-        required = False,
-        readonly = True,
-        default = None,
+        source = CertificateSource(),
+        default = None,
+        required = False,
+        readonly = True,
         )
     entry_session = schema.TextLine(