[Checkins] SVN: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/ resync with 2.2 branch
Leonardo Rochael Almeida
leorochael at gmail.com
Fri Feb 25 12:30:24 EST 2011
Log message for revision 120579:
resync with 2.2 branch
Changed:
D Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt
A Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/configure.zcml
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/state_groups.pt
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/states.dtml
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py
U Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt
-=-
Deleted: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt 2011-02-25 17:30:24 UTC (rev 120579)
@@ -1 +0,0 @@
-Zope Foundation and Contributors
\ No newline at end of file
Copied: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt (from rev 120578, Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow-mergepoint2/COPYRIGHT.txt)
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt (rev 0)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/COPYRIGHT.txt 2011-02-25 17:30:24 UTC (rev 120579)
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/CHANGES.txt 2011-02-25 17:30:24 UTC (rev 120579)
@@ -1,12 +1,38 @@
Products.DCWorkflow Changelog
=============================
-2.3.0-alpha (unreleased)
-------------------------
+2.2.4 (unreleased)
+------------------
+
+2.2.3 (2011-01-12)
+------------------
+
+- Explicitly include permissions from CMFCore, which are needed now that
+ they aren't declared in Five in Zope 2.13.
+
+
+2.2.2 (2010-11-11)
+------------------
+
+- Fixed Chameleon compatibility in `state_groups.pt`.
+
+- Workflow states cannot be renamed through the ZMI.
+ (https://bugs.launchpad.net/zope-cmf/+bug/625722)
+
+
+2.2.1 (2010-07-04)
+------------------
+
- Deal with deprecation warnings for Zope 2.13.
+2.2.0 (2010-01-04)
+------------------
+
+- no changes from version 2.2.0-beta
+
+
2.2.0-beta (2009-12-06)
-----------------------
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/States.py 2011-02-25 17:30:24 UTC (rev 120579)
@@ -265,6 +265,7 @@
all_meta_types = ({'name':StateDefinition.meta_type,
'action':'addState',
+ 'permission': ManagePortal,
},)
_manage_states = DTMLFile('states', _dtmldir)
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Transitions.py 2011-02-25 17:30:24 UTC (rev 120579)
@@ -230,6 +230,7 @@
all_meta_types = ({'name':TransitionDefinition.meta_type,
'action':'addTransition',
+ 'permission': ManagePortal,
},)
_manage_transitions = DTMLFile('transitions', _dtmldir)
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Variables.py 2011-02-25 17:30:24 UTC (rev 120579)
@@ -115,6 +115,7 @@
all_meta_types = ({'name':VariableDefinition.meta_type,
'action':'addVariable',
+ 'permission': ManagePortal,
},)
_manage_variables = DTMLFile('variables', _dtmldir)
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/Worklists.py 2011-02-25 17:30:24 UTC (rev 120579)
@@ -199,6 +199,7 @@
all_meta_types = ({'name':WorklistDefinition.meta_type,
'action':'addWorklist',
+ 'permission': ManagePortal,
},)
_manage_worklists = DTMLFile('worklists', _dtmldir)
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/configure.zcml
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/configure.zcml 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/configure.zcml 2011-02-25 17:30:24 UTC (rev 120579)
@@ -2,8 +2,14 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:five="http://namespaces.zope.org/five"
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="cmf_default">
+ <configure zcml:condition="installed AccessControl.security">
+ <!-- for Zope 2.13 -->
+ <include package="Products.CMFCore" file="permissions.zcml" />
+ </configure>
+
<include package=".browser"/>
<include file="exportimport.zcml"/>
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/state_groups.pt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/state_groups.pt 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/state_groups.pt 2011-02-25 17:30:24 UTC (rev 120579)
@@ -10,7 +10,7 @@
<form action="setGroups" method="POST"
tal:define="wf here/getWorkflow; roles wf/getRoles">
-<table width="100%" cellspacing="0" cellpadding="2" border="0" nowrap>
+<table width="100%" cellspacing="0" cellpadding="2" border="0" nowrap="nowrap">
<tr class="list-header">
<td align="left">
<div class="form-label">
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/states.dtml
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/states.dtml 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/dtml/states.dtml 2011-02-25 17:30:24 UTC (rev 120579)
@@ -50,11 +50,6 @@
</dtml-in>
</table>
<dtml-if values>
-<p>
- <b>Note:</b> Renaming a state will not affect any items in that state. You
- will need to fix them manually.
-</p>
-<input type="submit" name="manage_renameForm:method" value="Rename" />
<input type="submit" name="deleteStates:method" value="Delete" />
<input type="submit" name="setInitialState:method" value="Set Initial State" />
</dtml-if>
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/tests/test_DCWorkflow.py 2011-02-25 17:30:24 UTC (rev 120579)
@@ -16,28 +16,35 @@
import unittest
import Testing
+import transaction
from zope.component import adapter
from zope.component import provideHandler
from zope.interface.verify import verifyClass
+from AccessControl.SecurityManagement import newSecurityManager
from Products.CMFCore.testing import TraversingEventZCMLLayer
from Products.CMFCore.tests.base.dummy import DummyContent
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
+from Products.CMFCore.tests.base.security import OmnipotentUser
+from Products.CMFCore.tests.base.testcase import SecurityTest
from Products.CMFCore.WorkflowTool import WorkflowTool
from Products.DCWorkflow.interfaces import IAfterTransitionEvent
from Products.DCWorkflow.interfaces import IBeforeTransitionEvent
+class DCWorkflowDefinitionTests(SecurityTest):
-class DCWorkflowDefinitionTests(unittest.TestCase):
-
layer = TraversingEventZCMLLayer
def setUp(self):
+ SecurityTest.setUp(self)
self.site = DummySite('site')
+ self.root._setObject( 'site', self.site )
self.site._setObject( 'portal_types', DummyTool() )
self.site._setObject( 'portal_workflow', WorkflowTool() )
self._constructDummyWorkflow()
+ transaction.savepoint(optimistic=True)
+ newSecurityManager(None, OmnipotentUser().__of__(self.site))
def test_interfaces(self):
from Products.CMFCore.interfaces import IWorkflowDefinition
@@ -70,6 +77,9 @@
default_expr="python:state_change.kwargs.get('comment', '')",
for_status=1, update_always=1)
+ wf.worklists.addWorklist('published_documents')
+
+
def _getDummyWorkflow(self):
wftool = self.site.portal_workflow
return wftool.wf
@@ -175,6 +185,26 @@
# Check with kwargs.
self.assert_(wf.isActionSupported(dummy, 'publish', arg1=1, arg2=2))
+ def test_rename(self):
+
+ wftool = self.site.portal_workflow
+ wf = self._getDummyWorkflow()
+
+ wf.states.manage_renameObject('private', 'private_new')
+ self.assertNotEquals(None, wf.states._getOb('private_new', None))
+
+ wf.transitions.manage_renameObject('publish', 'publish_new')
+ self.assertNotEquals(None, wf.transitions._getOb('publish_new', None))
+
+ wf.variables.manage_renameObject('comments', 'comments_new')
+ self.assertNotEquals(None, wf.variables._getOb('comments_new', None))
+
+ wf.worklists.manage_renameObject('published_documents',
+ 'published_documents_new')
+ self.assertNotEquals(None,
+ wf.worklists._getOb('published_documents_new', None))
+
+
# XXX more tests...
Modified: Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt
===================================================================
--- Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt 2011-02-25 15:49:21 UTC (rev 120578)
+++ Sandbox/lra/branches/restore-WorkflowMethod-Products.DCWorkflow/Products/DCWorkflow/version.txt 2011-02-25 17:30:24 UTC (rev 120579)
@@ -1 +1 @@
-2.3.0dev
+2.2.4dev
More information about the checkins
mailing list