Changeset 6413 for main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

Timestamp:

20 Jun 2011, 00:30:10 (13 years ago)

Author:

uli

Message:

Start to make the whole accesscode story work again.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

@@ -6 +6 @@
 from BTrees.OIBTree import OIBTree
 from datetime import datetime
-from hurry.workflow.interfaces import IWorkflowInfo, InvalidTransitionError
+from hurry.workflow.interfaces import (
+    IWorkflowInfo, InvalidTransitionError, IWorkflowState)
 from random import SystemRandom as random
 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
@@ -12 +13 @@
     IAccessCode, IAccessCodeBatch, IAccessCodeBatchContainer
     )
-from waeup.sirp.accesscodes.workflow import DISABLED
+from waeup.sirp.accesscodes.workflow import DISABLED, USED
 
 class ManageACBatches(grok.Permission):
@@ -51 +52 @@
             return None
         return self.batch.cost
+
+    @property
+    def disabled(self):
+        return IWorkflowState(self).getState() == DISABLED
+
+    @property
+    def used(self):
+        return IWorkflowState(self).getState() == USED
 
 class AccessCodeBatch(grok.Model):
@@ -454 +463 @@
     meanings.
     """
-    ac = get_access_code(access_code)
-    if ac:
-        info = IWorkflowInfo(ac)
-        return _fire_transition(info, 'use')
-    else:
-        False
+    return fire_transition(access_code, 'use')
 
 def disable_accesscode(access_code):