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

formdefs: exclude None values from get_formdefs_of_all_kinds list (#37058)

This commit is contained in:
Nicolas Roche 2019-10-18 10:04:24 +02:00
parent e9d53a2569
commit 7c02aac054
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test_formdef.py
View File

@ -410,11 +410,14 @@ def test_get_formdefs_of_all_kinds(pub):
carddef.store()
wf1 = Workflow(name='workflow with form fields formdef')
display_form = FormWorkflowStatusItem()
display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
st1 = wf1.add_status('Status1', 'st1')
st1.items.append(display_form)
display_form.parent = st1
display_form1 = FormWorkflowStatusItem()
display_form1.formdef = WorkflowFormFieldsFormDef(item=display_form1)
display_form1.parent = st1
display_form2 = FormWorkflowStatusItem()
display_form2.parent = st1
st1.items.append(display_form1)
st1.items.append(display_form2) # empty formdef
wf1.store()
wf2 = Workflow(name='workflow with variables fields formdef')

2
wcs/formdef.py
View File

@ -1642,7 +1642,7 @@ def get_formdefs_of_all_kinds():
for workflow in Workflow.select(**kwargs):
for status in workflow.possible_status:
for item in status.items:
if isinstance(item, FormWorkflowStatusItem):
if isinstance(item, FormWorkflowStatusItem) and item.formdef:
formdefs.append(item.formdef)
if workflow.variables_formdef:
formdefs.append(workflow.variables_formdef)