Changeset 6353 for main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py

Timestamp:

11 Jun 2011, 18:51:17 (13 years ago)

Author:

uli

Message:

Split workflow components (general use stuff goes to w.s.workflow), add some convenience stuff, ...)

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py (modified) (5 diffs)

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

@@ -59 +59 @@
     IApplicantsContainer, IApplicantsContainerAdd, application_types_vocab
     )
-from waeup.sirp.applicants.workflow import create_workflow, INITIALIZED, STARTED
+from waeup.sirp.applicants.workflow import INITIALIZED, STARTED
 
 results_widget = CustomWidgetFactory(
@@ -73 +73 @@
     MultiListDisplayWidget, subwidget=results_display_widget)
 
-TRANSITION_OBJECTS = create_workflow()
+#TRANSITION_OBJECTS = create_workflow()
 
 #TRANSITION_DICT = dict([
@@ -538 +538 @@
         datepicker.need() # Enable jQuery datepicker in date fields.
         super(EditApplicantFull, self).update()
+        self.wf_info = IWorkflowInfo(self.context)
         return
 
@@ -551 +552 @@
     def getTransitions(self):
         """Return a list of dicts of allowed transition ids and titles.
+
+        Each list entry provides keys ``name`` and ``title`` for
+        internal name and (human readable) title of a single
+        transition.
         """
-        allowed_transitions_ids = IWorkflowInfo(
-            self.context).getManualTransitionIds()
-        null_transition = [{'name': '', 'title':'No transition'}]
-        transitions = null_transition + [dict(
-            name=transition_object.transition_id,
-            title=transition_object.title)
-            for transition_object in TRANSITION_OBJECTS
-            if transition_object.transition_id in allowed_transitions_ids]
-        return transitions
+        allowed_transitions = self.wf_info.getManualTransitions()
+        return [dict(name=x, title=y) for x, y in allowed_transitions]
 
     @grok.action('Save')
@@ -569 +567 @@
         if form.has_key('transition') and form['transition']:
             transition_id = form['transition']
-            IWorkflowInfo(self.context).fireTransition(transition_id)
+            self.wf_info.fireTransition(transition_id)
         self.flash('Form has been saved.')
         self.context.getApplicantsRootLogger().info('Saved')