0001-wf-remove-trigger-from-jump-item-attached-to-global-.patch
tests/admin_pages/test_workflow.py | ||
---|---|---|
774 | 774 | |
775 | 775 |
resp = app.get('/backoffice/workflows/1/global-actions/ac1/items/_jump/') |
776 | 776 |
assert 'Previously Marked Status' in [x[2] for x in resp.form['status'].options] |
777 |
assert 'trigger' not in resp.form.fields |
|
777 | 778 | |
778 | 779 |
jump_global.set_marker_on_status = False |
779 | 780 |
workflow.store() |
wcs/wf/jump.py | ||
---|---|---|
31 | 31 |
from ..qommon.publisher import get_publisher_class |
32 | 32 |
from ..qommon.cron import CronJob |
33 | 33 | |
34 |
from wcs.workflows import Workflow, WorkflowStatusJumpItem, register_item_class |
|
34 |
from wcs.workflows import Workflow, WorkflowStatusJumpItem, WorkflowGlobalAction, register_item_class
|
|
35 | 35 |
from wcs.api import get_user_from_api_query_string, is_url_signed |
36 | 36 |
from wcs.conditions import Condition |
37 | 37 | |
... | ... | |
168 | 168 |
return wf_status[0].name |
169 | 169 | |
170 | 170 |
def get_parameters(self): |
171 |
if hasattr(self, 'parent') and isinstance(self.parent, WorkflowGlobalAction): |
|
172 |
return ('status', 'condition', 'by', 'timeout', 'set_marker_on_status') |
|
171 | 173 |
return ('status', 'condition', 'trigger', 'by', 'timeout', 'set_marker_on_status') |
172 | 174 | |
173 | 175 |
def add_parameters_widgets(self, form, parameters, prefix='', formdef=None): |
174 |
- |