Changeset 12168 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers

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/customers

Files:

• contracts.py (modified) (1 diff)
• documents.py (modified) (1 diff)
• export.py (modified) (1 diff)
• workflow.py (modified) (1 diff)

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)