Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
91
Merge Requests
91
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
15d38abb
Commit
15d38abb
authored
Sep 23, 2019
by
Bryton Lacquement
🚪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up: Products.DCWorkflow 2.3.0+SlapOSPatched001
parent
0b77a430
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
30 deletions
+30
-30
component/egg-patch/Products.DCWorkflow/workflow_method.patch
...onent/egg-patch/Products.DCWorkflow/workflow_method.patch
+28
-28
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
No files found.
component/egg-patch/Products.DCWorkflow/workflow_method.patch
View file @
15d38abb
diff -uNr Products.DCWorkflow-2.
2.4/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.2.4
nxd001/Products/DCWorkflow/DCWorkflow.py
diff -uNr Products.DCWorkflow-2.
3.0/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.3.0
nxd001/Products/DCWorkflow/DCWorkflow.py
--- Products.DCWorkflow-2.
2.4/Products/DCWorkflow/DCWorkflow.py 2011-11-01 18:55:01.000000000 +01
00
--- Products.DCWorkflow-2.
3.0/Products/DCWorkflow/DCWorkflow.py 2017-05-04 11:35:48.000000000 +02
00
+++ Products.DCWorkflow-2.
2.4nxd001/Products/DCWorkflow/DCWorkflow.py 2013-10-31 16:42:05.021141352 +01
00
+++ Products.DCWorkflow-2.
3.0nxd001/Products/DCWorkflow/DCWorkflow.py 2019-09-13 17:51:27.396181694 +02
00
@@ -
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
@@ -2
81,6 +282
,52 @@
@@ -2
77,6 +278
,52 @@
raise Unauthorized(action)
raise Unauthorized(action)
self._changeStateOf(ob, tdef, kw)
self._changeStateOf(ob, tdef, kw)
...
@@ -62,9 +62,20 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
...
@@ -62,9 +62,20 @@ 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/Transitions.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py
--- 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/Transitions.py 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/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 @@
@@ -56,6 +56,16 @@
</tr>
</tr>
...
@@ -82,9 +93,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properti
...
@@ -82,9 +93,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.4
nxd001/Products/DCWorkflow/dtml/transitions.dtml
diff -uNr Products.DCWorkflow-2.
3.0/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.3.0
nxd001/Products/DCWorkflow/dtml/transitions.dtml
--- Products.DCWorkflow-2.
2.4/Products/DCWorkflow/dtml/transitions.dtml 2011-11-01 18:55:01.000000000 +01
00
--- Products.DCWorkflow-2.
3.0/Products/DCWorkflow/dtml/transitions.dtml 2017-05-04 11:35:48.000000000 +02
00
+++ Products.DCWorkflow-2.
2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml 2013-10-31 16:42:05.021141352 +01
00
+++ Products.DCWorkflow-2.
3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml 2019-09-13 17:54:18.323989786 +02
00
@@ -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 +106,15 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Pr
...
@@ -95,26 +106,15 @@ 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.4
nxd001/Products/DCWorkflow/exportimport.py
diff -uNr Products.DCWorkflow-2.
3.0/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.3.0
nxd001/Products/DCWorkflow/exportimport.py
--- Products.DCWorkflow-2.
2.4/Products/DCWorkflow/exportimport.py 2011-11-01 18:55:01.000000000 +01
00
--- Products.DCWorkflow-2.
3.0/Products/DCWorkflow/exportimport.py 2017-05-04 11:35:48.000000000 +02
00
+++ Products.DCWorkflow-2.
2.4nxd001/Products/DCWorkflow/exportimport.py 2013-10-31 16:42:09.221141578 +01
00
+++ Products.DCWorkflow-2.
3.0nxd001/Products/DCWorkflow/exportimport.py 2019-09-13 17:55:03.758065281 +02
00
@@ -3
4,7 +34
,7 @@
@@ -3
2,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
--- 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):
stack/erp5/buildout.cfg
View file @
15d38abb
...
@@ -602,7 +602,7 @@ extra-paths =
...
@@ -602,7 +602,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#
f886b434751da845b20bd2e24b855a81
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
...
@@ -644,7 +644,7 @@ scripts +=
...
@@ -644,7 +644,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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment