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

workflows: do not include submit button by default in form action (#74186) #89

Merged
fpeters merged 1 commits from wip/74186-wf-form-action-no-button-by-default into main 2023-02-10 09:15:22 +01:00
Conversation 0 Commits 1 Files Changed 7 +16 -1
7 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/backoffice_pages/test_all.py
View File

@ -942,6 +942,7 @@ def test_backoffice_multi_actions_interactive(pub):
form_action.formdef.fields.append(
fields.StringField(id='1', label='Test', varname='test', type='string', required=True)
)
form_action.hide_submit_button = False
register_comment = action.add_action('register-comment')
register_comment.comment = 'HELLO {{ form_workflow_form_blah_var_test }}'
@ -1272,6 +1273,7 @@ def test_backoffice_global_interactive_action(pub):
prefill={'type': 'string', 'value': 'a{{form_var_foo}}b'},
),
)
form_action.hide_submit_button = False
register_comment = action.add_action('register-comment')
register_comment.comment = 'HELLO {{ form_workflow_form_blah_var_test }}'
trigger = action.triggers[0]
@ -3719,6 +3721,7 @@ def test_backoffice_workflow_form_with_other_buttons(pub):
display_form = status.add_action('form', id='_display_form')
display_form.by = [user.roles[0]]
display_form.varname = 'blah'
display_form.hide_submit_button = False
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields.append(
fields.StringField(id='1', label='Test', varname='str', type='string', required=True)

1
tests/backoffice_pages/test_carddata.py
View File

@ -1188,6 +1188,7 @@ def test_backoffice_card_global_interactive_action(pub):
form_action.formdef.fields.append(
fields.StringField(id='1', label='Test', varname='test', type='string', required=True)
)
form_action.hide_submit_button = False
register_comment = action.add_action('register-comment')
register_comment.comment = 'HELLO {{ form_workflow_form_blah_var_test }}'
trigger = action.triggers[0]

6
tests/form_pages/test_all.py
View File

@ -8563,6 +8563,7 @@ def test_frontoffice_workflow_form_with_dynamic_list(pub):
display_form = status.add_action('form', id='_display_form')
display_form.by = ['_submitter']
display_form.varname = 'blah'
display_form.hide_submit_button = False
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields = [
fields.ItemField(id='1', label='Test', varname='foo', type='item', items=['10', '20']),
@ -8642,6 +8643,7 @@ def test_frontoffice_workflow_form_and_other_button(pub, button_position):
display_form.by = ['_submitter']
display_form.varname = 'blah'
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.hide_submit_button = False
display_form.formdef.fields = [
fields.StringField(id='1', label='Test', varname='foo', type='string', required=True),
fields.StringField(id='2', label='Test2', varname='foo2', type='string', required=True),
@ -8838,6 +8840,7 @@ def test_frontoffice_workflow_form_with_disappearing_option(pub, monkeypatch):
display_form = st1.add_action('form')
display_form.by = ['_submitter']
display_form.varname = 'blah'
display_form.hide_submit_button = False
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields = [
fields.ItemField(id='1', label='Test', varname='foo', type='item', data_source={'type': 'foobar'}),
@ -9746,6 +9749,7 @@ def test_workflow_form_structured_data(pub):
display_form = status.add_action('form', id='_display_form')
display_form.by = ['_submitter']
display_form.varname = 'blah'
display_form.hide_submit_button = False
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields = [
fields.BlockField(id='1', label='test', type='block:foobar', varname='fooblock'),
@ -9836,6 +9840,7 @@ def test_workflow_form_file_access(pub):
display_form = status.add_action('form', id='_display_form')
display_form.by = ['_submitter']
display_form.varname = 'blah'
display_form.hide_submit_button = False
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields = [
fields.BlockField(id='1', label='test', type='block:foobar', varname='fooblock', max_items=3),
@ -10094,6 +10099,7 @@ def test_global_interactive_action(pub):
form_action = action.add_action('form')
form_action.varname = 'blah'
form_action.hide_submit_button = False
form_action.formdef = WorkflowFormFieldsFormDef(item=form_action)
form_action.formdef.fields.append(
fields.StringField(id='1', label='Test', varname='test', type='string', required=True)

2
tests/form_pages/test_formdata.py
View File

@ -1363,12 +1363,14 @@ def test_formdata_workflow_many_forms(pub):
display_form1.varname = 'xxx'
display_form1.formdef = WorkflowFormFieldsFormDef(item=display_form1)
display_form1.formdef.fields = [fields.StringField(id='1', label='blah1')]
display_form1.hide_submit_button = False
# second form with live condition
display_form2 = st1.add_action('form', id='_y')
display_form2.by = ['_submitter']
display_form2.varname = 'yyy'
display_form2.formdef = WorkflowFormFieldsFormDef(item=display_form2)
display_form2.hide_submit_button = False
display_form2.formdef.fields = [
fields.StringField(id='1', label='Test', varname='str', type='string', required=True),
fields.StringField(

1
tests/form_pages/test_live.py
View File

@ -394,6 +394,7 @@ def test_field_live_select_content_on_workflow_form(pub, http_requests):
display_form = st1.add_action('form', id='_x')
display_form.by = ['_submitter']
display_form.varname = 'xxx'
display_form.hide_submit_button = False
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields = [
fields.StringField(type='string', id='1', label='Bar', size='40', required=True, varname='bar'),

2
tests/workflow/test_all.py
View File

@ -2888,6 +2888,7 @@ def test_display_form(pub):
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields.append(StringField(id='1', label='Test', type='string'))
display_form.formdef.fields.append(DateField(id='2', label='Date', type='date', varname='date'))
display_form.hide_submit_button = False
form = Form(action='#', use_tokens=False)
display_form.fill_form(form, formdata, None)
@ -2985,6 +2986,7 @@ def test_display_form_hide_submit_button(pub):
display_form.by = ['_submitter']
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
display_form.formdef.fields.append(StringField(id='1', label='Test', varname='test', type='string'))
display_form.hide_submit_button = False
wf.store()

2
wcs/wf/form.py
View File

@ -119,7 +119,7 @@ class FormWorkflowStatusItem(WorkflowStatusItem):
by = []
formdef = None
varname = None
hide_submit_button = False
hide_submit_button = True
@property
def submit_button_label(self):