[Checkins] SVN: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/ Backport 120813 from trunk (don't crash when using Expressions in Worklists) and add missing log of previous change
Leonardo Rochael Almeida
leorochael at gmail.com
Wed Mar 9 04:40:14 EST 2011
Log message for revision 120816:
Backport 120813 from trunk (don't crash when using Expressions in Worklists) and add missing log of previous change
Changed:
U Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt
U Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/worklists.dtml
U Products.DCWorkflow/branches/2.2/Products/DCWorkflow/tests/test_DCWorkflow.py
-=-
Modified: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt 2011-03-09 08:01:44 UTC (rev 120815)
+++ Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt 2011-03-09 09:40:13 UTC (rev 120816)
@@ -4,7 +4,12 @@
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)
------------------
Modified: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/worklists.dtml
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/worklists.dtml 2011-03-09 08:01:44 UTC (rev 120815)
+++ Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/worklists.dtml 2011-03-09 09:40:13 UTC (rev 120816)
@@ -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>
Modified: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/tests/test_DCWorkflow.py
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/tests/test_DCWorkflow.py 2011-03-09 08:01:44 UTC (rev 120815)
+++ Products.DCWorkflow/branches/2.2/Products/DCWorkflow/tests/test_DCWorkflow.py 2011-03-09 09:40:13 UTC (rev 120816)
@@ -38,8 +38,8 @@
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,7 +204,17 @@
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...
More information about the checkins
mailing list