Changeset 12168

Timestamp:

8 Dec 2014, 06:17:30 (10 years ago)

Author:

Henrik Bettermann

Message:

Documents can't be verified without file(s) attached.

Let is_approvable and is_verifiable be more verbose.

Location:

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

Files:

• customers/contracts.py (modified) (1 diff)
• customers/documents.py (modified) (1 diff)
• customers/export.py (modified) (1 diff)
• customers/workflow.py (modified) (1 diff)
• documents/document.py (modified) (1 diff)
• documents/interfaces.py (modified) (1 diff)
• documents/workflow.py (modified) (2 diffs)

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

@@ -143 +143 @@
                 state = getattr(obj, 'state', None)
                 if state and state != VERIFIED:
-                    return False
-        return True
+                    return False, _("Attached documents must be verified first.")
+        return True, None
 
     @property

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

@@ -141 +141 @@
         return files
 
+    @property
+    def is_verifiable(self):
+        return True, None
+
     def setMD5(self):
         """Set md5 checksum attribute for files connected to this document.

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

@@ -159 +159 @@
             omit=['is_editable_by_customer',
                   'is_editable_by_manager',
+                  'is_verifiable',
                   'translated_state',
                   'formatted_transition_date',

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

@@ -248 +248 @@
     """
     if event.transition.destination == APPROVED:
-        if not obj.is_approvable:
+        approvable, error = obj.is_approvable
+        if not approvable:
             # Undo transition and raise an exception.
             IWorkflowState(obj).setState(event.transition.source)
-            raise InvalidTransitionError(
-                _("Attached documents must be verified first."))
+            raise InvalidTransitionError(error)
     msg = event.transition.user_data['msg']
     history = IObjectHistory(obj)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py

@@ -87 +87 @@
         return
 
+    @property
+    def is_verifiable(self):
+        return True, None
+
     def setMD5(self):
         """Determine md5 checksum of all files and store checksums as

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/interfaces.py

@@ -53 +53 @@
     user_id = Attribute('Id of a user')
     connected_files = Attribute('Names of files connected to a document')
+    is_verifiable = Attribute('Contract verifiable by officer')
 
     title = schema.TextLine(

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

@@ -22 +22 @@
 from zope.component import getUtility
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
-from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
+from hurry.workflow.interfaces import (
+    IWorkflowState, IWorkflowTransitionEvent, InvalidTransitionError)
 from waeup.ikoba.interfaces import (
     IObjectHistory, IIkobaWorkflowInfo,
@@ -128 +129 @@
     """Append message to document history and log file and update
     last_transition_date when transition happened.
+
+    Undo the verification of document and raise an exception if document
+    does not meet the requirements for verification.
     """
+    if event.transition.destination == VERIFIED:
+        verifiable, error = obj.is_verifiable
+        if not verifiable:
+            # Undo transition and raise an exception.
+            IWorkflowState(obj).setState(event.transition.source)
+            raise InvalidTransitionError(error)
     if event.transition.transition_id == 'verify':
         obj.setMD5()