Changeset 9266 for main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/batching.py

Timestamp:

2 Oct 2012, 06:43:52 (12 years ago)

Author:

Henrik Bettermann

Message:

Repair and optimize AccessCodeProcessor?. AC states and transitions can now be imported in create and update mode.

File:

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

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/batching.py

@@ -20 +20 @@
 """
 import grok
-from hurry.workflow.interfaces import IWorkflowState
+from hurry.workflow.interfaces import IWorkflowState, IWorkflowInfo
 from zope.interface import Interface
-from waeup.kofa.interfaces import IBatchProcessor, IGNORE_MARKER, IObjectHistory
+from waeup.kofa.interfaces import (
+    IBatchProcessor, IGNORE_MARKER, IObjectHistory, IObjectConverter)
 from waeup.kofa.utils.batching import BatchProcessor
 from waeup.kofa.accesscodes.interfaces import IAccessCodeBatch, IAccessCode
+from waeup.kofa.accesscodes.workflow import INITIALIZED, USED, DISABLED
+
+IMPORTABLE_TRANSITIONS = (
+    'init', 'use', 'disable_used', 'disable_used', 'reeanble')
+
+IMPORTABLE_STATES = (INITIALIZED, USED, DISABLED)
 
 class AccessCodeBatchProcessor(BatchProcessor):
@@ -98 +105 @@
                     self.location_fields + [
                         'random_num', 'owner', 'cost',
-                        'state', 'batch_serial',
-                        'history',]
+                        'state', 'batch_serial',]
                     )))
 
     @property
     def required_fields(self):
-        return ['random_num', 'state', 'batch_serial', 'history',]
+        return ['random_num', 'batch_serial', 'history',]
 
     def parentsExist(self, row, site):
@@ -133 +139 @@
         parent[row['representation']] = obj
         return
+
+    def checkConversion(self, row, mode='create'):
+        """Validates all values in row.
+        """
+        converter = IObjectConverter(self.iface)
+        errs, inv_errs, conv_dict =  converter.fromStringDict(
+            row, self.factory_name, mode=mode)
+        if row.has_key('transition') and row.has_key('state'):
+            if row['transition'] not in (IGNORE_MARKER, '') and \
+                row['state'] not in (IGNORE_MARKER, ''):
+                errs.append(('workflow','not allowed'))
+                return errs, inv_errs, conv_dict
+        if row.has_key('transition'):
+            if row['transition'] not in IMPORTABLE_TRANSITIONS:
+                if row['transition'] not in (IGNORE_MARKER, ''):
+                    errs.append(('transition','not allowed'))
+        if row.has_key('state'):
+            if row['state'] not in IMPORTABLE_STATES:
+                if row['state'] not in (IGNORE_MARKER, ''):
+                    errs.append(('state','not allowed'))
+                else:
+                    # State is an attribute of AccessCode and must not
+                    # be changed if empty.
+                    conv_dict['state'] = IGNORE_MARKER
+        return errs, inv_errs, conv_dict
+
+    def checkUpdateRequirements(self, obj, row, site):
+        """Checks requirements the object must fulfill when being updated.
+
+        This method is not used in case of deleting or adding objects.
+
+        Returns error messages as strings in case of requirement
+        problems.
+        """
+        transition = row.get('transition', IGNORE_MARKER)
+        if transition not in (IGNORE_MARKER, ''):
+            allowed_transitions = IWorkflowInfo(obj).getManualTransitionIds()
+            if transition not in allowed_transitions:
+                return 'Transition not allowed.'
+        return None
 
     def updateEntry(self, obj, row, site):
@@ -147 +193 @@
                 IWorkflowState(obj).setState(value)
                 items_changed += ('%s=%s, ' % ('state', state))
+                msg = "state '%s' set" % state
+                IObjectHistory(obj).addMessage(msg)
             row.pop('state')
-        # Update history
-        if row.has_key('history'):
-            history = row.get('history', IGNORE_MARKER)
-            if history not in (IGNORE_MARKER, ''):
-                values = row['history'].split('||')
-                for value in values:
-                    IObjectHistory(obj).addMessage(value)
-                items_changed += ('%s=%s, ' % ('history', history))
-            row.pop('history')
+        # Fire transition
+        if row.has_key('transition'):
+            transition = row.get('transition', IGNORE_MARKER)
+            if transition not in (IGNORE_MARKER, ''):
+                value = row['transition']
+                IWorkflowInfo(obj).fireTransition(value)
+                items_changed += ('%s=%s, ' % ('transition', transition))
+            row.pop('transition')
 
         # In import files we can use the hash symbol at the end of a
         # random_num string to avoid annoying automatic number transformation
         # by Excel or Calc
-        row['random_num'] = row['random_num'].strip('#')
+        if row.has_key('random_num'):
+            random_num = row.get('random_num', IGNORE_MARKER)
+            if random_num not in (IGNORE_MARKER, ''):
+                row['random_num'] = random_num.strip('#')
 
         items_changed += super(AccessCodeProcessor, self).updateEntry(