From 64a90a738e38a70972e28df640cd87ecb21ff58a Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 26 Jan 2021 15:34:38 +0100 Subject: [PATCH] wf: remove trigger from jump item attached to global action (#11280) --- tests/admin_pages/test_workflow.py | 1 + wcs/wf/jump.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/admin_pages/test_workflow.py b/tests/admin_pages/test_workflow.py index b62dad45..7c3a5d65 100644 --- a/tests/admin_pages/test_workflow.py +++ b/tests/admin_pages/test_workflow.py @@ -759,6 +759,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() diff --git a/wcs/wf/jump.py b/wcs/wf/jump.py index 1fd2c465..9b22168d 100644 --- a/wcs/wf/jump.py +++ b/wcs/wf/jump.py @@ -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 @@ -171,7 +171,10 @@ class JumpWorkflowStatusItem(WorkflowStatusJumpItem): return wf_status[0].name def get_parameters(self): - return ('status', 'condition', 'trigger', 'by', 'timeout', 'set_marker_on_status') + parameters = {'status', 'condition', 'trigger', 'by', 'timeout', 'set_marker_on_status'} + if isinstance(self.parent, WorkflowGlobalAction): + parameters.remove('trigger') + return parameters def add_parameters_widgets(self, form, parameters, prefix='', formdef=None): super(JumpWorkflowStatusItem, self).add_parameters_widgets( -- 2.20.1