Changeset 1838

Timestamp:

Feb 11, 2007 3:31:59 AM (11 years ago)

Author:

hazmat

Message:

get it running

Location:

Products.PloneAdaptedWorkflow/trunk

Files:

• patches.py (modified) (1 diff)
• workflow.py (modified) (4 diffs)

Products.PloneAdaptedWorkflow/trunk/patches.py

@@ -11 +11 @@
 import workflow
 
-# if plone is using cmfplacefulworkflow, get rid of it and let normal inheritance flows work.
-if 'CMFPlacefulWorkflow' in inspect.getmodule( WorkflowTool.getChainFor).__name__:
-    del WorkflowTool.getChainFor
-    
 
 import Products.CMFPlone.WorkflowTool
-Products.CMFPlone.WorkflowTool.WorkflowTool = type( WorkflowTool.__name__, (workflow.WorkflowTool,), {})
+
+# if plone is using cmfplacefulworkflow, get rid of it and let normal inheritance flows work.
+#if 'CMFPlacefulWorkflow' in inspect.getmodule( WorkflowTool.getChainFor).__name__:
+#    del WorkflowTool.getChainFor
+
+for method_name in ('getChainFor', 'getHistoryOf', 'setStatusOf'):
+    method = getattr( workflow.WorkflowTool, method_name )
+    setattr( WorkflowTool, method_name, method.im_func )
+    
+#Products.CMFPlone.WorkflowTool.WorkflowTool = type( WorkflowTool.__name__, (workflow.WorkflowTool,WorkflowTool), {})
 
 
 
+

Products.PloneAdaptedWorkflow/trunk/workflow.py

@@ -19 +19 @@
         pt = context
     elif hasattr( aq_base( context ), 'getPortalTypeName'):
-        pt = ob.getPortalTypeName()
+        pt = context.getPortalTypeName()
     else:
         pt = None
@@ -37 +37 @@
 
 def CMFPlacefulWorkflowChain( context, workflow_tool ):
-    print "cmfpw", context.portal_type
+    print type( context )
     from Products.CMFPlacefulWorkflow.patches import workflowtoolPatch as cmfpw
     return cmfpw.getChainFor( workflow_tool, context )
@@ -43 +43 @@
 def DefaultWorkflowState( context ):
     if hasattr( aq_base, 'workflow_history'):
-        history = ob.workflow_history
+        history = context.workflow_history
     else:
         history = PersistentMapping()
-        setattr( ob, 'workflow_history', history )
+        setattr( context, 'workflow_history', history )
     return history
 
 def DefaultWorkflowStateQuery( context ):
-    if hasattr( aq_base( ob ), 'workflow_history'):
-        wfh = ob.workflow_history
+    if hasattr( aq_base( context ), 'workflow_history'):
+        wfh = context.workflow_history
     else:
         wfh = ()
@@ -86 +86 @@
         the portal_type.
         """
-        return zope.component.getMultiAdapter( (ob, self), interfaces.IWorkflowChain, default=() )
+        return zope.component.getMultiAdapter( (ob, self), interfaces.IWorkflowChain )