[CMF-checkins] CVS: CMF/DCWorkflow - Default.py:1.4 Transitions.py:1.3

[Shane Hathaway]

Update of /cvs-repository/CMF/DCWorkflow
In directory cvs.zope.org:/tmp/cvs-serv22502

Modified Files:
	Default.py Transitions.py 
Log Message:
Added patch from Joseph Wayne Norton (norton at alum.mit.edu) for
compatibility with Zope 2.3.x.  Thanks!


=== CMF/DCWorkflow/Default.py 1.3 => 1.4 ===
     vdef = wf.variables['action']
     vdef.setProperties(description='The last transition',
-                       default_expr='transition/getId',
+                       default_expr='transition/getId|nothing',
                        for_status=1)
 
     vdef = wf.variables['actor']
@@ -343,7 +343,7 @@
 
     vdef = wf.variables['action']
     vdef.setProperties(description='The last transition',
-                       default_expr='transition/getId',
+                       default_expr='transition/getId|nothing',
                        for_status=1)
 
     vdef = wf.variables['actor']


=== CMF/DCWorkflow/Transitions.py 1.2 => 1.3 ===
         self.id = id
 
+    def getId(self):
+        return self.id
+
     def getGuardSummary(self):
         res = None
         if self.guard is not None: