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

wf: remove trigger from jump item attached to global action (#11280)

This commit is contained in:
Valentin Deniaud 2021-01-26 15:34:38 +01:00
parent 8c211f2448
commit 3be0032b4f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/admin_pages/test_workflow.py
View File

@ -780,6 +780,7 @@ def test_workflows_edit_jump_previous(pub):
resp = app.get('/backoffice/workflows/1/global-actions/ac1/items/_jump/')
assert 'Previously Marked Status' in [x[2] for x in resp.form['status'].options]
assert 'trigger' not in resp.form.fields
jump_global.set_marker_on_status = False
workflow.store()

4
wcs/wf/jump.py
View File

@ -31,7 +31,7 @@ from ..qommon import errors
from ..qommon.publisher import get_publisher_class
from ..qommon.cron import CronJob
from wcs.workflows import Workflow, WorkflowStatusJumpItem, register_item_class
from wcs.workflows import Workflow, WorkflowStatusJumpItem, WorkflowGlobalAction, register_item_class
from wcs.api import get_user_from_api_query_string, is_url_signed
from wcs.conditions import Condition
@ -168,6 +168,8 @@ class JumpWorkflowStatusItem(WorkflowStatusJumpItem):
return wf_status[0].name
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', 'trigger', 'by', 'timeout', 'set_marker_on_status')
def add_parameters_widgets(self, form, parameters, prefix='', formdef=None):