Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Products.DCWorkflow
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Products.DCWorkflow
Commits
24018004
Commit
24018004
authored
Oct 14, 2013
by
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- fixed Chameleon compatibility
parent
cb7bb7c0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
220 additions
and
241 deletions
+220
-241
Products/DCWorkflow/exportimport.py
Products/DCWorkflow/exportimport.py
+5
-5
Products/DCWorkflow/tests/test_exportimport.py
Products/DCWorkflow/tests/test_exportimport.py
+4
-4
Products/DCWorkflow/xml/wtcWorkflowExport.xml
Products/DCWorkflow/xml/wtcWorkflowExport.xml
+211
-232
No files found.
Products/DCWorkflow/exportimport.py
View file @
24018004
...
...
@@ -226,7 +226,7 @@ class WorkflowDefinitionConfigurator(Implicit):
'script_info' -- a list of mappings describing the scripts which
provide added business logic (see '_extractScripts').
"""
workflow_info
[
'manager_bypass'
]
=
bool
(
workflow
.
manager_bypass
)
workflow_info
[
'manager_bypass'
]
=
str
(
bool
(
workflow
.
manager_bypass
)
)
workflow_info
[
'creation_guard'
]
=
self
.
_extractCreationGuard
(
workflow
)
workflow_info
[
'state_variable'
]
=
workflow
.
state_var
workflow_info
[
'initial_state'
]
=
workflow
.
initial_state
...
...
@@ -294,9 +294,9 @@ class WorkflowDefinitionConfigurator(Implicit):
info
=
{
'id'
:
k
,
'description'
:
v
.
description
,
'for_catalog'
:
bool
(
v
.
for_catalog
),
'for_status'
:
bool
(
v
.
for_status
),
'update_always'
:
bool
(
v
.
update_always
),
'for_catalog'
:
str
(
bool
(
v
.
for_catalog
)
),
'for_status'
:
str
(
bool
(
v
.
for_status
)
),
'update_always'
:
str
(
bool
(
v
.
update_always
)
),
'default_value'
:
v
.
default_value
,
'default_type'
:
default_type
,
'default_expr'
:
v
.
getDefaultExprText
(),
...
...
@@ -406,7 +406,7 @@ class WorkflowDefinitionConfigurator(Implicit):
for
k
,
v
in
items
:
result
.
append
({
'name'
:
k
,
'roles'
:
v
,
'acquired'
:
not
isinstance
(
v
,
tuple
)})
'acquired'
:
str
(
not
isinstance
(
v
,
tuple
)
)})
return
result
...
...
Products/DCWorkflow/tests/test_exportimport.py
View file @
24018004
...
...
@@ -251,9 +251,9 @@ class WorkflowDefinitionConfiguratorTests(_WorkflowSetup, _GuardChecker):
self
.
assertEqual
(
info
[
'description'
],
expected
[
0
])
self
.
assertEqual
(
info
[
'default_value'
],
expected
[
1
])
self
.
assertEqual
(
info
[
'default_expr'
],
expected
[
2
])
self
.
assertEqual
(
info
[
'for_catalog'
],
expected
[
3
]
)
self
.
assertEqual
(
info
[
'for_status'
],
expected
[
4
]
)
self
.
assertEqual
(
info
[
'update_always'
],
expected
[
5
]
)
self
.
assertEqual
(
info
[
'for_catalog'
],
str
(
expected
[
3
])
)
self
.
assertEqual
(
info
[
'for_status'
],
str
(
expected
[
4
])
)
self
.
assertEqual
(
info
[
'update_always'
],
str
(
expected
[
5
])
)
self
.
_assertGuard
(
info
,
*
expected
[
-
4
:])
...
...
@@ -297,7 +297,7 @@ class WorkflowDefinitionConfiguratorTests(_WorkflowSetup, _GuardChecker):
fp
=
[
x
for
x
in
permissions
if
x
[
'name'
]
==
ep_id
][
0
]
self
.
assertEqual
(
fp
[
'acquired'
],
not
isinstance
(
ep_roles
,
tuple
))
str
(
not
isinstance
(
ep_roles
,
tuple
)
))
self
.
assertEqual
(
len
(
fp
[
'roles'
]),
len
(
ep_roles
))
...
...
Products/DCWorkflow/xml/wtcWorkflowExport.xml
View file @
24018004
<?xml version="1.0" encoding="UTF-8"?>
<dc-workflow
xmlns:tal=
"http://xml.zope.org/namespaces/tal"
workflow_id=
"dcworkflow"
title=
"Some DCWorkflow"
description=
"Some Description"
state_variable=
"review_state"
initial_state=
"visible"
tal:define=
"info python: here.getWorkflowInfo(
options[ 'workflow_id' ] )"
tal:attributes=
"workflow_id info/id;
title info/title;
description info/description;
manager_bypass info/manager_bypass;
state_variable info/state_variable;
initial_state info/initial_state"
><tal:case
tal:condition=
"info/creation_guard"
>
<instance-creation-conditions
tal:define=
"creation_guard info/creation_guard"
>
<guard
><tal:case
tal:condition=
"creation_guard/guard_permissions"
>
<guard-permission
tal:repeat=
"permission creation_guard/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case
><tal:case
tal:condition=
"creation_guard/guard_roles"
>
<guard-role
tal:repeat=
"role creation_guard/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case
><tal:case
tal:condition=
"creation_guard/guard_groups"
>
<guard-group
tal:repeat=
"group creation_guard/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case
><tal:case
tal:condition=
"creation_guard/guard_expr"
>
<guard-expression
tal:content=
"creation_guard/guard_expr"
>
EXPRESSION
</guard-expression
></tal:case>
<dc-workflow
xmlns:tal=
"http://xml.zope.org/namespaces/tal"
workflow_id=
"dcworkflow"
title=
"Some DCWorkflow"
description=
"Some Description"
state_variable=
"review_state"
initial_state=
"visible"
tal:define=
"info python: context.getWorkflowInfo(options['workflow_id'])"
tal:attributes=
"workflow_id info/id;
title info/title;
description info/description;
manager_bypass info/manager_bypass;
state_variable info/state_variable;
initial_state info/initial_state"
><tal:case
tal:condition=
"info/creation_guard"
>
<instance-creation-conditions
tal:define=
"creation_guard info/creation_guard"
>
<guard><tal:case
tal:condition=
"creation_guard/guard_permissions"
>
<guard-permission
tal:repeat=
"permission creation_guard/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case><tal:case
tal:condition=
"creation_guard/guard_roles"
>
<guard-role
tal:repeat=
"role creation_guard/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case><tal:case
tal:condition=
"creation_guard/guard_groups"
>
<guard-group
tal:repeat=
"group creation_guard/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case><tal:case
tal:condition=
"creation_guard/guard_expr"
>
<guard-expression
tal:content=
"creation_guard/guard_expr"
>
EXPR
</guard-expression></tal:case>
</guard>
</instance-creation-conditions></tal:case>
<permission
tal:repeat=
"permission info/permissions"
tal:content=
"permission"
>
PERMISSION
</permission>
<state
state_id=
"pending"
title=
"Waiting for reviewer"
tal:repeat=
"state info/state_info"
tal:attributes=
"state_id state/id;
title state/title;
"
><tal:case
tal:condition=
"state/description"
>
<description
tal:content=
"state/description"
>
DESCRIPTION
</description></tal:case>
<exit-transition
transition_id=
"TRANSITION_ID"
tal:repeat=
"exit state/transitions"
tal:attributes=
"transition_id exit"
/>
<permission-map
name=
""
acquired=
"True"
tal:repeat=
"perm state/permissions"
tal:attributes=
"name perm/name;
acquired perm/acquired;
"
>
<permission-role
tal:repeat=
"role perm/roles"
tal:content=
"role"
>
ROLE
</permission-role>
</permission-map>
<group-map
name=
""
tal:repeat=
"group state/groups"
tal:attributes=
"name python: group[ 0 ];
"
>
<group-role
tal:repeat=
"role python: group[ 1 ]"
tal:content=
"role"
>
ROLE
</group-role>
</group-map>
<assignment
name=
"VAR_NAME"
type=
"VAR_TYPE"
tal:repeat=
"var state/variables"
tal:attributes=
"name var/name;
type var/type;
"
tal:content=
"var/value"
>
VALUE
</assignment>
</state>
<transition
transition_id=
"Publish"
title=
"Reviewer publishes content"
new_state=
"published"
trigger=
"USER"
before_script=
""
after_script=
""
tal:repeat=
"transition info/transition_info"
tal:attributes=
"transition_id transition/id;
title transition/title;
new_state transition/new_state_id;
trigger transition/trigger_type;
before_script transition/script_name;
after_script transition/after_script_name;
"
><tal:case
tal:condition=
"transition/description"
>
<description
tal:content=
"transition/description"
>
DESCRIPTION
</description></tal:case>
<action
url=
"URL"
category=
"CATEGORY"
tal:condition=
"transition/actbox_name"
tal:attributes=
"url transition/actbox_url;
icon transition/actbox_icon;
category transition/actbox_category;
"
tal:content=
"transition/actbox_name"
>
ACTION NAME
</action>
<guard
><tal:case
tal:condition=
"transition/guard_permissions"
>
<guard-permission
tal:repeat=
"permission transition/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case
><tal:case
tal:condition=
"transition/guard_roles"
>
<guard-role
tal:repeat=
"role transition/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case
><tal:case
tal:condition=
"transition/guard_groups"
>
<guard-group
tal:repeat=
"group transition/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case
><tal:case
tal:condition=
"transition/guard_expr"
>
<guard-expression
tal:content=
"transition/guard_expr"
>
EXPRESSION
</guard-expression
></tal:case>
</instance-creation-conditions></tal:case><tal:case
tal:condition=
"info/permissions"
>
<permission
tal:repeat=
"permission info/permissions"
tal:content=
"permission"
>
PERMISSION
</permission></tal:case><tal:case
tal:condition=
"info/state_info"
>
<state
state_id=
"pending"
title=
"Waiting for reviewer"
tal:repeat=
"state info/state_info"
tal:attributes=
"state_id state/id;
title state/title"
><tal:case
tal:condition=
"state/description"
>
<description
tal:content=
"state/description"
>
DESCRIPTION
</description></tal:case><tal:case
tal:condition=
"state/transitions"
>
<exit-transition
transition_id=
"TRANSITION_ID"
tal:repeat=
"exit state/transitions"
tal:attributes=
"transition_id exit"
/></tal:case><tal:case
tal:condition=
"state/permissions"
>
<permission-map
name=
""
acquired=
"True"
tal:repeat=
"perm state/permissions"
tal:attributes=
"name perm/name;
acquired perm/acquired"
><tal:case
tal:condition=
"perm/roles"
>
<permission-role
tal:repeat=
"role perm/roles"
tal:content=
"role"
>
ROLE
</permission-role></tal:case>
</permission-map></tal:case><tal:case
tal:condition=
"state/groups"
>
<group-map
name=
""
tal:repeat=
"group state/groups"
tal:attributes=
"name python: group[0]"
>
<group-role
tal:repeat=
"role python: group[1]"
tal:content=
"role"
>
ROLE
</group-role>
</group-map></tal:case><tal:case
tal:condition=
"state/variables"
>
<assignment
name=
"VAR_NAME"
type=
"VAR_TYPE"
tal:repeat=
"var state/variables"
tal:attributes=
"name var/name;
type var/type"
tal:content=
"var/value"
>
VALUE
</assignment></tal:case>
</state></tal:case><tal:case
tal:condition=
"info/transition_info"
>
<transition
transition_id=
"Publish"
title=
"Reviewer publishes content"
new_state=
"published"
trigger=
"USER"
before_script=
""
after_script=
""
tal:repeat=
"transition info/transition_info"
tal:attributes=
"transition_id transition/id;
title transition/title;
new_state transition/new_state_id;
trigger transition/trigger_type;
before_script transition/script_name;
after_script transition/after_script_name"
><tal:case
tal:condition=
"transition/description"
>
<description
tal:content=
"transition/description"
>
DESCRIPTION
</description></tal:case>
<action
url=
"URL"
category=
"CATEGORY"
tal:condition=
"transition/actbox_name"
tal:attributes=
"url transition/actbox_url;
icon transition/actbox_icon;
category transition/actbox_category"
tal:content=
"transition/actbox_name"
>
ACTION NAME
</action>
<guard><tal:case
tal:condition=
"transition/guard_permissions"
>
<guard-permission
tal:repeat=
"permission transition/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case><tal:case
tal:condition=
"transition/guard_roles"
>
<guard-role
tal:repeat=
"role transition/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case><tal:case
tal:condition=
"transition/guard_groups"
>
<guard-group
tal:repeat=
"group transition/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case><tal:case
tal:condition=
"transition/guard_expr"
>
<guard-expression
tal:content=
"transition/guard_expr"
>
EXPRESSION
</guard-expression></tal:case>
</guard><tal:case
tal:condition=
"transition/variables"
>
<assignment
name=
"VAR_NAME"
tal:repeat=
"var transition/variables"
tal:attributes=
"name var/name"
tal:content=
"var/expr"
>
EXPRESSION
</assignment></tal:case>
</transition></tal:case><tal:case
tal:condition=
"info/worklist_info"
>
<worklist
worklist_id=
"reviewer_queue"
title=
"For Review"
tal:repeat=
"worklist info/worklist_info"
tal:attributes=
"worklist_id worklist/id;
title worklist/title"
><tal:case
tal:condition=
"worklist/description"
>
<description
tal:content=
"worklist/description"
>
DESCRIPTION
</description></tal:case>
<action
url=
"URL"
category=
"CATEGORY"
tal:condition=
"worklist/actbox_name"
tal:attributes=
"url worklist/actbox_url;
category worklist/actbox_category;
icon worklist/actbox_icon"
tal:content=
"worklist/actbox_name"
>
ACTION NAME
</action>
<guard><tal:case
tal:condition=
"worklist/guard_permissions"
>
<guard-permission
tal:repeat=
"permission worklist/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case><tal:case
tal:condition=
"worklist/guard_roles"
>
<guard-role
tal:repeat=
"role worklist/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case><tal:case
tal:condition=
"worklist/guard_groups"
>
<guard-group
tal:repeat=
"group worklist/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case><tal:case
tal:condition=
"worklist/guard_expr"
>
<guard-expression
tal:content=
"worklist/guard_expr"
>
EXPRESSION
</guard-expression></tal:case>
</guard>
<assignment
name=
"VAR_NAME"
tal:repeat=
"var transition/variables"
tal:attributes=
"name var/name"
tal:content=
"var/expr"
>
EXPRESSION
</assignment>
</transition>
<worklist
worklist_id=
"reviewer_queue"
title=
"For Review"
tal:repeat=
"worklist info/worklist_info"
tal:attributes=
"worklist_id worklist/id;
title worklist/title;
"
><tal:case
tal:condition=
"worklist/description"
>
<description
tal:content=
"worklist/description"
>
DESCRIPTION
</description></tal:case>
<action
url=
"URL"
category=
"CATEGORY"
tal:condition=
"worklist/actbox_name"
tal:attributes=
"url worklist/actbox_url;
category worklist/actbox_category;
icon worklist/actbox_icon;
"
tal:content=
"worklist/actbox_name"
>
ACTION NAME
</action>
<guard
><tal:case
tal:condition=
"worklist/guard_permissions"
>
<guard-permission
tal:repeat=
"permission worklist/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case
><tal:case
tal:condition=
"worklist/guard_roles"
>
<guard-role
tal:repeat=
"role worklist/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case
><tal:case
tal:condition=
"worklist/guard_groups"
>
<guard-group
tal:repeat=
"group worklist/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case
><tal:case
tal:condition=
"worklist/guard_expr"
>
<guard-expression
tal:content=
"worklist/guard_expr"
>
EXPRESSION
</guard-expression
></tal:case>
</guard>
<match
name=
"review_state"
values=
"pending"
tal:repeat=
"match worklist/var_match"
tal:attributes=
"name python: match[ 0 ];
values python: match[ 1 ];
"
/>
</worklist>
<variable
variable_id=
"action"
for_catalog=
"True"
for_status=
"True"
update_always=
"True"
tal:repeat=
"variable info/variable_info"
tal:attributes=
"variable_id variable/id;
for_catalog variable/for_catalog;
for_status variable/for_status;
update_always variable/update_always;
"
><tal:case
tal:condition=
"variable/description"
>
<description
tal:content=
"variable/description"
>
DESCRIPTION
</description></tal:case>
<match
name=
"review_state"
values=
"pending"
tal:repeat=
"match worklist/var_match"
tal:attributes=
"name python: match[0];
values python: match[1]"
/>
</worklist></tal:case><tal:case
tal:condition=
"info/variable_info"
>
<variable
variable_id=
"action"
for_catalog=
"True"
for_status=
"True"
update_always=
"True"
tal:repeat=
"variable info/variable_info"
tal:attributes=
"variable_id variable/id;
for_catalog variable/for_catalog;
for_status variable/for_status;
update_always variable/update_always"
><tal:case
tal:condition=
"variable/description"
>
<description
tal:content=
"variable/description"
>
DESCRIPTION
</description></tal:case>
<default>
<value
type=
"VAR_TYPE"
tal:attributes=
"type variable/default_type"
tal:condition=
"variable/default_value"
tal:content=
"variable/default_value"
>
VALUE
</value>
<expression
tal:condition=
"variable/default_expr"
tal:content=
"variable/default_expr"
>
EXPRESSION
</expression>
<value
type=
"VAR_TYPE"
tal:attributes=
"type variable/default_type"
tal:condition=
"variable/default_value"
tal:content=
"variable/default_value"
>
VALUE
</value>
<expression
tal:condition=
"variable/default_expr"
tal:content=
"variable/default_expr"
>
EXPRESSION
</expression>
</default>
<guard
><tal:case
tal:condition=
"variable/guard_permissions"
>
<guard-permission
tal:repeat=
"permission variable/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case
><tal:case
tal:condition=
"variable/guard_roles"
>
<guard-role
tal:repeat=
"role variable/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case
><tal:case
tal:condition=
"variable/guard_groups"
>
<guard-group
tal:repeat=
"group variable/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case
><tal:case
tal:condition=
"variable/guard_expr"
>
<guard-expression
tal:content=
"variable/guard_expr"
>
EXPRESSION
</guard-expression
></tal:case>
<guard><tal:case
tal:condition=
"variable/guard_permissions"
>
<guard-permission
tal:repeat=
"permission variable/guard_permissions"
tal:content=
"permission"
>
PERMISSION
</guard-permission></tal:case><tal:case
tal:condition=
"variable/guard_roles"
>
<guard-role
tal:repeat=
"role variable/guard_roles"
tal:content=
"role"
>
ROLE
</guard-role></tal:case><tal:case
tal:condition=
"variable/guard_groups"
>
<guard-group
tal:repeat=
"group variable/guard_groups"
tal:content=
"group"
>
GROUP
</guard-group></tal:case><tal:case
tal:condition=
"variable/guard_expr"
>
<guard-expression
tal:content=
"variable/guard_expr"
>
EXPRESSION
</guard-expression></tal:case>
</guard>
</variable>
<script
script_id=
"SCRIPT_ID"
type=
"Script (Python)"
filename=
"/path/to/SCRIPT_ID.py"
module=
""
function=
""
tal:repeat=
"script info/script_info"
tal:attributes=
"script_id script/id;
type script/meta_type;
filename script/filename;
module script/module;
function script/function
"
/>
</variable></tal:case><tal:case
tal:condition=
"info/script_info"
>
<script
script_id=
"SCRIPT_ID"
type=
"Script (Python)"
filename=
"/path/to/SCRIPT_ID.py"
module=
""
function=
""
tal:repeat=
"script info/script_info"
tal:attributes=
"script_id script/id;
type script/meta_type;
filename script/filename;
module script/module;
function script/function"
/></tal:case>
</dc-workflow>
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