Backport 120813 from trunk (don't crash when using Expressions in Worklists)...

Backport 120813 from trunk (don't crash when using Expressions in Worklists) and add missing log of previous change

Products/DCWorkflow/CHANGES.txt

@@ -4,6 +4,11 @@ Products.DCWorkflow Changelog
 2.2.4 (unreleased)
 ------------------
 
+- Don't crash worklist's ``manage_main`` if variables are Expression objects.
+  (https://bugs.launchpad.net/zope-cmf/+bug/731394)
+
+- Allow renaming of states, transitions, variables and worklists
+
 
 2.2.3 (2011-01-12)
 ------------------

Products/DCWorkflow/dtml/worklists.dtml

@@ -21,12 +21,8 @@
    <dtml-if getVarMatchKeys>
     Catalog matches:
     <dtml-in getVarMatchKeys sort>
-    <dtml-let key=sequence-item value="getVarMatch(key)">
-     <code>&dtml-key;</code> =
-     <dtml-in value>
-       <code>&dtml-sequence-item;</code>
-       <dtml-unless sequence-end>or</dtml-unless>
-     </dtml-in>
+    <dtml-let key=sequence-item value="getVarMatchText(key)">
+     <code>&dtml-key;</code> = <code>&dtml-value;</code>
      <dtml-unless sequence-end>;</dtml-unless>
     </dtml-let>
     </dtml-in>

Products/DCWorkflow/tests/test_DCWorkflow.py

@@ -38,8 +38,8 @@ class DCWorkflowDefinitionTests(SecurityTest):
 
     def setUp(self):
         SecurityTest.setUp(self)
-        self.site = DummySite('site')
-        self.root._setObject( 'site', self.site )
+        self.root._setObject('site', DummySite('site') )
+        self.site = self.root._getOb('site')
         self.site._setObject( 'portal_types', DummyTool() )
         self.site._setObject( 'portal_workflow', WorkflowTool() )
         self._constructDummyWorkflow()
@@ -204,6 +204,16 @@ class DCWorkflowDefinitionTests(SecurityTest):
         self.assertNotEquals(None,
             wf.worklists._getOb('published_documents_new', None))
 
+    def test_worklists(self):
+        wf = self._getDummyWorkflow()
+        worklist =  wf.worklists._getOb('published_documents')
+        # check ZMI
+        wf.worklists.manage_main(self.REQUEST)
+        # store an Expression
+        worklist.setProperties('', props={'var_match_state': 'string:private'})
+        # check ZMI
+        wf.worklists.manage_main(self.app.REQUEST)
+
 
     # XXX more tests...