Skip to content

slapos
slapos
Commit f1f52429 authored by Bryton Lacquement's avatar Bryton Lacquement 🚪
Browse files
Options

version up: Products.DCWorkflow 2.3.0+SlapOSPatched001

parent 4edf7852
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
component/egg-patch/Products.DCWorkflow/workflow_method.patch
View file @ f1f52429
diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py 2011-11-01 18:55:01.000000000 +0100 --- Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py 2013-10-31 16:42:05.021141352 +0100 +++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py 2019-09-13 17:51:27.396181694 +0200
@@ -40,6 +40,7 @@ @@ -37,6 +37,7 @@
from Products.DCWorkflow.permissions import ManagePortal from Products.DCWorkflow.permissions import ManagePortal
from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION 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 ...@@ -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 Message as _
from Products.DCWorkflow.utils import modifyRolesForGroup from Products.DCWorkflow.utils import modifyRolesForGroup
from Products.DCWorkflow.utils import modifyRolesForPermission from Products.DCWorkflow.utils import modifyRolesForPermission
@@ -281,6 +282,52 @@ @@ -277,6 +278,52 @@
raise Unauthorized(action) raise Unauthorized(action)
self._changeStateOf(ob, tdef, kw) self._changeStateOf(ob, tdef, kw)
...@@ -62,9 +62,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D ...@@ -62,9 +62,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
security.declarePrivate('isInfoSupported') security.declarePrivate('isInfoSupported')
def isInfoSupported(self, ob, name): 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 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.2.4/Products/DCWorkflow/dtml/transition_properties.dtml 2011-11-01 18:55:01.000000000 +0100 --- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transition_properties.dtml 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml 2013-10-31 16:42:05.021141352 +0100 +++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transition_properties.dtml 2019-09-13 17:53:15.309111199 +0200
@@ -56,6 +56,16 @@ @@ -56,6 +56,16 @@
</tr> </tr>
...@@ -82,9 +82,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properti ...@@ -82,9 +82,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properti
<th align="left">Script (before)</th> <th align="left">Script (before)</th>
<td> <td>
<select name="script_name"> <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 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.2.4/Products/DCWorkflow/dtml/transitions.dtml 2011-11-01 18:55:01.000000000 +0100 --- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transitions.dtml 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml 2013-10-31 16:42:05.021141352 +0100 +++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml 2019-09-13 17:54:18.323989786 +0200
@@ -17,7 +17,8 @@ @@ -17,7 +17,8 @@
<td> <td>
Destination state: <code><dtml-if new_state_id>&dtml-new_state_id;<dtml-else>(Remain in state)</dtml-if></code> <br /> Destination state: <code><dtml-if new_state_id>&dtml-new_state_id;<dtml-else>(Remain in state)</dtml-if></code> <br />
...@@ -95,26 +95,26 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Pr ...@@ -95,26 +95,26 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Pr
<br /> <br />
<dtml-if script_name> <dtml-if script_name>
Script (before): &dtml-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 diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py 2011-11-01 18:55:01.000000000 +0100 --- Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py 2013-10-31 16:42:09.221141578 +0100 +++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py 2019-09-13 17:55:03.758065281 +0200
@@ -34,7 +34,7 @@ @@ -32,7 +32,7 @@
from Products.GenericSetup.interfaces import ISetupEnviron from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import BodyAdapterBase from Products.GenericSetup.utils import BodyAdapterBase
-TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' ) -TRIGGER_TYPES = ('AUTOMATIC', 'USER')
+TRIGGER_TYPES = ( 'AUTOMATIC', 'USER', 'METHOD' ) +TRIGGER_TYPES = ('AUTOMATIC', 'USER', 'METHOD')
_FILENAME = 'workflows.xml' _FILENAME = 'workflows.xml'
diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py
--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py 2011-11-01 18:55:01.000000000 +0100 --- Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py 2017-05-04 11:35:48.000000000 +0200
+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py 2013-10-31 16:42:12.389141749 +0100 +++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py 2019-09-13 17:56:55.071150292 +0200
@@ -31,6 +31,7 @@ @@ -29,6 +29,7 @@
TRIGGER_AUTOMATIC = 0 TRIGGER_AUTOMATIC = 0
TRIGGER_USER_ACTION = 1 TRIGGER_USER_ACTION = 1
+TRIGGER_WORKFLOW_METHOD = 2 +TRIGGER_WORKFLOW_METHOD = 2
class TransitionDefinition (SimpleItem): class TransitionDefinition(SimpleItem):
stack/erp5/buildout.cfg
View file @ f1f52429
...@@ -603,7 +603,7 @@ extra-paths = ...@@ -603,7 +603,7 @@ extra-paths =
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#1d9a56e9af4371f5b6951ebf217a15d7 Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#1d9a56e9af4371f5b6951ebf217a15d7
Acquisition-patch-options = -p1 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#0bd00af377750253bd275f2ccfdf9379
Products.DCWorkflow-patch-options = -p1 Products.DCWorkflow-patch-options = -p1
python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068 python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
python-magic-patch-options = -p1 python-magic-patch-options = -p1
...@@ -645,7 +645,7 @@ scripts += ...@@ -645,7 +645,7 @@ scripts +=
# patched eggs # patched eggs
Acquisition = 2.13.12+SlapOSPatched001 Acquisition = 2.13.12+SlapOSPatched001
Products.DCWorkflow = 2.2.4+SlapOSPatched001 Products.DCWorkflow = 2.3.0+SlapOSPatched001
ocropy = 1.0+SlapOSPatched001 ocropy = 1.0+SlapOSPatched001
pysvn = 1.7.10+SlapOSPatched002 pysvn = 1.7.10+SlapOSPatched002
python-ldap = 2.4.32+SlapOSPatched001 python-ldap = 2.4.32+SlapOSPatched001
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7