Commit aaf08bfa by Bryton Lacquement

wip

1 parent 458177dd
diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py 2011-11-01 18:55:01.000000000 +0100
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py 2013-10-31 16:42:05.021141352 +0100
@@ -40,6 +40,7 @@
diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py
--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py 2019-09-13 17:51:27.396181694 +0200
@@ -37,6 +37,7 @@
from Products.DCWorkflow.permissions import ManagePortal
from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
......@@ -9,7 +9,7 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
from Products.DCWorkflow.utils import Message as _
from Products.DCWorkflow.utils import modifyRolesForGroup
from Products.DCWorkflow.utils import modifyRolesForPermission
@@ -281,6 +282,52 @@
@@ -277,6 +278,52 @@
raise Unauthorized(action)
self._changeStateOf(ob, tdef, kw)
......@@ -62,9 +62,20 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
security.declarePrivate('isInfoSupported')
def isInfoSupported(self, ob, name):
'''
diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml 2011-11-01 18:55:01.000000000 +0100
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml 2013-10-31 16:42:05.021141352 +0100
diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py
--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py 2019-09-13 17:56:55.071150292 +0200
@@ -29,6 +29,7 @@
TRIGGER_AUTOMATIC = 0
TRIGGER_USER_ACTION = 1
+TRIGGER_WORKFLOW_METHOD = 2
class TransitionDefinition(SimpleItem):
diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transition_properties.dtml 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transition_properties.dtml 2019-09-13 17:53:15.309111199 +0200
@@ -56,6 +56,16 @@
</tr>
......@@ -82,9 +93,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properti
<th align="left">Script (before)</th>
<td>
<select name="script_name">
diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml 2011-11-01 18:55:01.000000000 +0100
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml 2013-10-31 16:42:05.021141352 +0100
diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml
--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transitions.dtml 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml 2019-09-13 17:54:18.323989786 +0200
@@ -17,7 +17,8 @@
<td>
Destination state: <code><dtml-if new_state_id>&dtml-new_state_id;<dtml-else>(Remain in state)</dtml-if></code> <br />
......@@ -95,26 +106,15 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Pr
<br />
<dtml-if script_name>
Script (before): &dtml-script_name;
diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py 2011-11-01 18:55:01.000000000 +0100
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py 2013-10-31 16:42:09.221141578 +0100
@@ -34,7 +34,7 @@
diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py
--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py 2019-09-13 17:55:03.758065281 +0200
@@ -32,7 +32,7 @@
from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import BodyAdapterBase
-TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' )
+TRIGGER_TYPES = ( 'AUTOMATIC', 'USER', 'METHOD' )
-TRIGGER_TYPES = ('AUTOMATIC', 'USER')
+TRIGGER_TYPES = ('AUTOMATIC', 'USER', 'METHOD')
_FILENAME = 'workflows.xml'
diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py 2011-11-01 18:55:01.000000000 +0100
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py 2013-10-31 16:42:12.389141749 +0100
@@ -31,6 +31,7 @@
TRIGGER_AUTOMATIC = 0
TRIGGER_USER_ACTION = 1
+TRIGGER_WORKFLOW_METHOD = 2
class TransitionDefinition (SimpleItem):
......@@ -596,7 +596,7 @@ extra-paths =
patch-binary = ${patch:location}/bin/patch
Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#1d9a56e9af4371f5b6951ebf217a15d7
Acquisition-patch-options = -p1
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#f886b434751da845b20bd2e24b855a81
Products.DCWorkflow-patch-options = -p1
python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
python-magic-patch-options = -p1
......@@ -638,7 +638,7 @@ scripts +=
# patched eggs
Acquisition = 2.13.12+SlapOSPatched001
Products.DCWorkflow = 2.2.4+SlapOSPatched001
Products.DCWorkflow = 2.3.0+SlapOSPatched001
ocropy = 1.0+SlapOSPatched001
pysvn = 1.7.10+SlapOSPatched002
python-ldap = 2.4.32+SlapOSPatched001
......@@ -681,7 +681,7 @@ Products.CMFActionIcons = 2.1.3
Products.DCWorkflowGraph = 0.4.1
# Products.ExternalEditor 2.0.0's dtml is not based on Zope2 OFS's one.
Products.ExternalEditor = 1.1.1
Products.GenericSetup = 1.8.6
Products.GenericSetup = 1.8.7
Products.LongRequestLogger = 2.1.0
# Products.MimetypesRegistry 2.1 requires AccessControl>=3.0.0Acquisition.
Products.MimetypesRegistry = 2.0.10
......@@ -702,7 +702,7 @@ csp-eventlet = 0.7.0
erp5diff = 0.8.1.7
eventlet = 0.20.1
five.formlib = 1.0.4
five.localsitemanager = 2.0.5
five.localsitemanager = 2.0.6
google-api-python-client = 1.6.1
greenlet = 0.4.12
http-parser = 0.8.3
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!