entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 34 Releases Activity

workflows: remove timeout/roles options for jump used in global action (#68002)

This commit is contained in:
Frédéric Péters 2022-08-07 10:03:56 +02:00
parent 96a66c77fc
commit 1d2be9dd4f
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/admin_pages/test_workflow.py
View File

@ -1304,6 +1304,22 @@ def test_workflows_jump_target_links(pub):
assert not resp.pyquery.find('.jump a')
def test_workflows_edit_jump_in_global_action(pub):
create_superuser(pub)
Workflow.wipe()
workflow = Workflow(name='foo')
ac1 = workflow.add_global_action('Action', 'ac1')
jump = ac1.add_action('jump', id='_jump')
workflow.store()
app = login(get_app(pub))
resp = app.get(jump.get_admin_url())
assert 'by' not in resp.form.fields
assert 'timeout' not in resp.form.fields
resp = resp.form.submit('submit')
def test_workflows_edit_sms_action(pub):
create_superuser(pub)
Workflow.wipe()

2
wcs/wf/jump.py
View File

@ -183,7 +183,7 @@ class JumpWorkflowStatusItem(WorkflowStatusJumpItem):
def get_parameters(self):
if hasattr(self, 'parent') and isinstance(self.parent, WorkflowGlobalAction):
return ('status', 'condition', 'by', 'timeout', 'set_marker_on_status')
return ('status', 'condition', 'set_marker_on_status')
return ('status', 'condition', 'trigger', 'by', 'timeout', 'set_marker_on_status')
def add_parameters_widgets(self, form, parameters, prefix='', formdef=None, **kwargs):