Changeset 12151

Timestamp:

5 Dec 2014, 15:43:24 (10 years ago)

Author:

Henrik Bettermann

Message:

Catch InvalidTransitionError? in UI.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

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

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -31 +31 @@
 from zope.formlib.textwidgets import BytesDisplayWidget
 from zope.security import checkPermission
-from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
+from hurry.workflow.interfaces import (
+    IWorkflowInfo, IWorkflowState, InvalidTransitionError)
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.interfaces import (
@@ -1255 +1256 @@
             transition_id = form['transition']
             wf_info = IWorkflowInfo(self.context)
-            wf_info.fireTransition(transition_id)
+            try:
+                wf_info.fireTransition(transition_id)
+            except InvalidTransitionError, error:
+                self.flash(error, type="warning")
         return
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -1226 +1226 @@
         IWorkflowInfo(self.contract).fireTransition('approve')
         self.assertEqual(IWorkflowState(self.contract).getState(), 'approved')
-        return
-
+
+
+    def test_contract_approval_in_UI(self):
+        # Now let's see what the UI says why trying to approve a contract
+        # with unverified documents.
+        IWorkflowState(self.document).setState('submitted')
+        self.contract.document_object = self.document
+        IWorkflowState(self.contract).setState('submitted')
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.contracts_path + '/c101/trigtrans')
+        self.browser.getControl(name="transition").value = ['approve']
+        self.browser.getControl("Save").click()
+        # InvalidTransitionError is catched
+        self.assertTrue(
+            '<div class="alert alert-warning">Attached documents must be verified first.</div>'
+            in self.browser.contents)
+        IWorkflowState(self.document).setState('verified')
+        self.browser.getControl(name="transition").value = ['approve']
+        self.browser.getControl("Save").click()
+        self.assertEqual(IWorkflowState(self.contract).getState(), 'approved')

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/workflow.py

@@ -252 +252 @@
             IWorkflowState(obj).setState(event.transition.source)
             raise InvalidTransitionError(
-                "Documents must be verified first.")
+                _("Attached documents must be verified first."))
     msg = event.transition.user_data['msg']
     history = IObjectHistory(obj)