Changeset 7322

Timestamp:

10 Dec 2011, 06:38:34 (13 years ago)

Author:

Henrik Bettermann

Message:

Catch InvalidTransitionError? and flash error message.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -25 +25 @@
 from zope.component import getUtility, createObject
 from zope.formlib.form import setUpEditWidgets
-from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
+from hurry.workflow.interfaces import (
+    IWorkflowInfo, IWorkflowState, InvalidTransitionError)
 from reportlab.pdfgen import canvas
 from reportlab.lib.units import cm
@@ -593 +594 @@
     # from the incoming request.
     def update(self):
-        if self.context.p_state == 'paid':
-            self.flash('This ticket has already been paid.')
+        self.wf_info = IWorkflowInfo(self.context.__parent__)
+        try:
+            self.wf_info.fireTransition('pay')
+        except InvalidTransitionError:
+            self.flash('Error: %s' % sys.exc_info()[1])
             return
         self.context.r_amount_approved = self.context.amount_auth
@@ -604 +608 @@
         self.context.__parent__.loggerInfo(
             ob_class, 'valid callback: %s' % self.context.p_id)
-        self.wf_info = IWorkflowInfo(self.context.__parent__)
-        self.wf_info.fireTransition('pay')
         self.flash('Valid callback received.')
         return

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

@@ -619 +619 @@
         # Callback can't be applied twice
         self.browser.open(payment_url + '/callback')
-        self.assertMatches('...This ticket has already been paid...',
-                          self.browser.contents)
+        self.assertMatches(
+            "...Transition 'pay' requires 'started' as source state...",
+            self.browser.contents)
         # The payment receipt can be downloaded now
         self.browser.open(payment_url)