Changeset 12089 for main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Timestamp:

28 Nov 2014, 21:35:09 (10 years ago)

Author:

Henrik Bettermann

Message:

Implement application content components and rework workflows.

Location:

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

Files:

• utils.py (modified) (2 diffs)
• workflow.py (modified) (6 diffs)

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

@@ -20 +20 @@
 import grok
 from waeup.ikoba.interfaces import MessageFactory as _
-from waeup.ikoba.documents.workflow import CREATED
+from waeup.ikoba.interfaces import (
+    CREATED, SUBMITTED,
+    VERIFIED, REJECTED, EXPIRED)
 from waeup.ikoba.documents.interfaces import IDocumentsUtils
-from waeup.ikoba.documents.workflow import (
-    CREATED, SUBMITTED,
-    VERIFIED, REJECTED, OUTDATED)
 
 
@@ -42 +41 @@
         VERIFIED: _('verified'),
         REJECTED: _('rejected'),
-        OUTDATED:_('outdated')
+        EXPIRED:_('expired')
         }

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

@@ -25 +25 @@
 from waeup.ikoba.interfaces import (
     IObjectHistory, IIkobaWorkflowInfo,
-    SimpleIkobaVocabulary)
+    SimpleIkobaVocabulary,
+    CREATED, SUBMITTED, VERIFIED, REJECTED, EXPIRED)
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.workflow import IkobaWorkflow, IkobaWorkflowInfo
@@ -31 +32 @@
 from waeup.ikoba.documents.interfaces import IDocument
 
-CREATED = 'created'
-SUBMITTED = 'submitted'
-VERIFIED = 'verified'
-REJECTED = 'rejected'
-OUTDATED = 'outdated'
+IMPORTABLE_STATES = (CREATED, SUBMITTED, VERIFIED, REJECTED, EXPIRED)
 
-IMPORTABLE_STATES = (CREATED, SUBMITTED, VERIFIED, REJECTED)
-
-REGISTRATION_TRANSITIONS = (
+VERIFICATION_TRANSITIONS = (
     Transition(
         transition_id = 'create',
@@ -71 +66 @@
     Transition(
         transition_id = 'reset1',
-        title = _('Reset'),
+        title = _('Reset to initial state'),
         msg = _('Reset to initial state'),
         source = REJECTED,
@@ -78 +73 @@
     Transition(
         transition_id = 'reset2',
-        title = _('Reset'),
+        title = _('Reset to initial state'),
         msg = _('Reset to initial state'),
         source = VERIFIED,
@@ -85 +80 @@
     Transition(
         transition_id = 'reset3',
-        title = _('Reset'),
+        title = _('Reset to initial state'),
         msg = _('Reset to initial state'),
         source = SUBMITTED,
@@ -91 +86 @@
 
     Transition(
-        transition_id = 'outdate',
-        title = _('Set to outdated'),
-        msg = _('Set to outdated'),
+        transition_id = 'expire',
+        title = _('Set to expired'),
+        msg = _('Set to expired'),
         source = VERIFIED,
-        destination = OUTDATED),
+        destination = EXPIRED),
+
+    Transition(
+        transition_id = 'reset4',
+        title = _('Reset to initial state'),
+        msg = _('Reset to initial state'),
+        source = EXPIRED,
+        destination = CREATED),
     )
 
 
-IMPORTABLE_TRANSITIONS = [i.transition_id for i in REGISTRATION_TRANSITIONS]
+IMPORTABLE_TRANSITIONS = [i.transition_id for i in VERIFICATION_TRANSITIONS]
 
-verification_workflow = IkobaWorkflow(REGISTRATION_TRANSITIONS)
+verification_workflow = IkobaWorkflow(VERIFICATION_TRANSITIONS)
 
 class VerificationWorkflowState(WorkflowState, grok.Adapter):