Hi there, I noticed we've two 'trees' for DCWorkflow: - http://cvs.zope.org/Products/DCWorkflow - http://cvs.zope.org/CMF/DCWorkflow The current diff between HEAD of the two versions are attached, the changes are minimal. I've looking for the reasons of split, but I don't found anything related... That said, I ask: is really necessary to maintain both trees? PS: I guess here's the right place to make this question. If I'm wrong, please point me to the right place... ;-) Best regards, -- Dorneles Treméa Caxias do Sul - RS - Brasil +55 54 9114 9312 - UIN: 2413568 X3ng Web Technology <http://www.x3ng.com.br> -----BEGIN GEEK CODE BLOCK----- Version: 3.12 GCS/IT d- s:->: a24 C+++ UBL++++$ P--- L++ E-- W+++ N++ o? K? w+ O M+ V-- PS+ PE- Y-- PGP++ t+ 5 X++ R+ tv+ b(++) DI+ D++ G+>+++ e++>++++ h---- r+++ y+++** ------END GEEK CODE BLOCK------ diff -x CVS -Nru CMF/DCWorkflow/DCWorkflow.py DCWorkflow/DCWorkflow.py --- CMF/DCWorkflow/DCWorkflow.py 2003-03-26 13:51:49.000000000 -0300 +++ DCWorkflow/DCWorkflow.py 2003-11-29 11:05:48.000000000 -0200 @@ -1,35 +1,29 @@ ############################################################################## # # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved. -# +# # This software is subject to the provisions of the Zope Public License, # Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE -# +# ############################################################################## """ Web-configurable workflow. -$Id: DCWorkflow.py,v 1.24 2003/03/26 16:51:49 efge Exp $ +$Id: DCWorkflow.py,v 1.25 2003/11/29 13:05:48 yuppie Exp $ """ -# Python library -from string import join - # Zope -from ZODB import Persistent -from AccessControl import getSecurityManager, ClassSecurityInfo -from OFS.Folder import Folder -from OFS.ObjectManager import bad_id -from OFS.Traversable import Traversable -from Globals import DTMLFile, PersistentMapping -import Acquisition +from AccessControl import ClassSecurityInfo +from AccessControl import getSecurityManager from Acquisition import aq_inner, aq_parent -import Globals -import App +from App.Undo import UndoSupport from DocumentTemplate.DT_Util import TemplateDict +from Globals import InitializeClass +from OFS.Folder import Folder +from OFS.ObjectManager import bad_id # CMFCore from Products.CMFCore.WorkflowCore import WorkflowException, \ @@ -83,7 +77,7 @@ {'label': 'Worklists', 'action': 'worklists/manage_main'}, {'label': 'Scripts', 'action': 'scripts/manage_main'}, {'label': 'Permissions', 'action': 'manage_permissions'}, - ) + App.Undo.UndoSupport.manage_options + ) + UndoSupport.manage_options security = ClassSecurityInfo() security.declareObjectProtected(ManagePortal) @@ -549,8 +543,8 @@ else: return new_sdef +InitializeClass(DCWorkflowDefinition) -Globals.InitializeClass(DCWorkflowDefinition) addWorkflowFactory(DCWorkflowDefinition, id='dc_workflow', title='Web-configurable workflow') diff -x CVS -Nru CMF/DCWorkflow/Default.py DCWorkflow/Default.py --- CMF/DCWorkflow/Default.py 2002-10-17 16:38:37.000000000 -0300 +++ DCWorkflow/Default.py 2003-09-01 12:18:36.000000000 -0300 @@ -1,32 +1,33 @@ ############################################################################## # # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved. -# +# # This software is subject to the provisions of the Zope Public License, # Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE -# +# ############################################################################## """ Programmatically creates a workflow. -$Id: Default.py,v 1.13 2002/10/17 19:38:37 chrism Exp $ +$Id: Default.py,v 1.14 2003/09/01 15:18:36 yuppie Exp $ """ -from Products.CMFCore.CMFCorePermissions import RequestReview, \ - ModifyPortalContent, \ - ReviewPortalContent +from Products.CMFCore.CMFCorePermissions import AccessContentsInformation +from Products.CMFCore.CMFCorePermissions import ModifyPortalContent +from Products.CMFCore.CMFCorePermissions import RequestReview +from Products.CMFCore.CMFCorePermissions import ReviewPortalContent +from Products.CMFCore.CMFCorePermissions import View from Products.CMFCore.WorkflowTool import addWorkflowFactory from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition -from AccessControl.Permissions import view, access_contents_information -p_access = access_contents_information +p_access = AccessContentsInformation p_modify = ModifyPortalContent -p_view = view -p_review = ReviewPortalContent p_request = RequestReview +p_review = ReviewPortalContent +p_view = View r_anon = 'Anonymous' r_manager = 'Manager' diff -x CVS -Nru CMF/DCWorkflow/States.py DCWorkflow/States.py --- CMF/DCWorkflow/States.py 2002-11-07 09:25:26.000000000 -0200 +++ DCWorkflow/States.py 2003-06-24 11:01:56.000000000 -0300 @@ -12,7 +12,7 @@ ############################################################################## """ States in a web-configurable workflow. -$Id: States.py,v 1.8 2002/11/07 11:25:26 chrisw Exp $ +$Id: States.py,v 1.9 2003/06/24 14:01:56 efge Exp $ """ from string import join @@ -97,16 +97,14 @@ _properties_form = DTMLFile('state_properties', _dtmldir) def manage_properties(self, REQUEST, manage_tabs_message=None): - ''' - ''' + """Show state properties ZMI form.""" return self._properties_form(REQUEST, management_view='Properties', manage_tabs_message=manage_tabs_message, ) def setProperties(self, title='', transitions=(), REQUEST=None, description=''): - ''' - ''' + """Set the properties for this State.""" self.title = str(title) self.description = str(description) self.transitions = tuple(map(str, transitions)) @@ -117,16 +115,14 @@ _variables_form = DTMLFile('state_variables', _dtmldir) def manage_variables(self, REQUEST, manage_tabs_message=None): - ''' - ''' + """Show State variables ZMI form.""" return self._variables_form(REQUEST, management_view='Variables', manage_tabs_message=manage_tabs_message, ) def getVariableValues(self): - ''' get VariableValues for management UI - ''' + """Get VariableValues for management UI.""" vv = self.var_values if vv is None: return [] @@ -134,12 +130,12 @@ return vv.items() def getWorkflowVariables(self): - ''' get all variables that are available form - workflow and not handled yet. - ''' + """Get all variables that are available from the workflow and + not handled yet. + """ wf_vars = self.getAvailableVarIds() if self.var_values is None: - return wf_vars + return wf_vars ret = [] for vid in wf_vars: if not self.var_values.has_key(vid): @@ -147,8 +143,7 @@ return ret def addVariable(self,id,value,REQUEST=None): - ''' add a WorkflowVariable to State - ''' + """Add a WorkflowVariable to State.""" if self.var_values is None: self.var_values = PersistentMapping() @@ -158,8 +153,7 @@ return self.manage_variables(REQUEST, 'Variable added.') def deleteVariables(self,ids=[],REQUEST=None): - ''' delete a WorkflowVariable from State - ''' + """Delete a WorkflowVariable from State.""" vv = self.var_values for id in ids: if vv.has_key(id): @@ -169,8 +163,7 @@ return self.manage_variables(REQUEST, 'Variables deleted.') def setVariables(self, ids=[], REQUEST=None): - ''' set values for Variables set by this state - ''' + """Set values for Variables set by this State.""" if self.var_values is None: self.var_values = PersistentMapping() @@ -187,17 +180,14 @@ _permissions_form = DTMLFile('state_permissions', _dtmldir) def manage_permissions(self, REQUEST, manage_tabs_message=None): - ''' - ''' - + """Present TTW UI for managing this State's permissions.""" return self._permissions_form(REQUEST, management_view='Permissions', manage_tabs_message=manage_tabs_message, ) def setPermissions(self, REQUEST): - ''' - ''' + """Set the permissions in REQUEST for this State.""" pr = self.permission_roles if pr is None: self.permission_roles = pr = PersistentMapping() @@ -214,8 +204,7 @@ return self.manage_permissions(REQUEST, 'Permissions changed.') def setPermission(self, permission, acquired, roles): - ''' - ''' + """Set a permission for this State.""" pr = self.permission_roles if pr is None: self.permission_roles = pr = PersistentMapping() diff -x CVS -Nru CMF/DCWorkflow/version.txt DCWorkflow/version.txt --- CMF/DCWorkflow/version.txt 2003-10-27 15:30:11.000000000 -0200 +++ DCWorkflow/version.txt 2003-01-30 19:27:39.000000000 -0200 @@ -1 +1 @@ -CMF-1.4.2 +DCWorkflow-0.5+