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

backoffice: ignore empty items data in field filters (#38889)

This commit is contained in:
Thomas NOËL 2020-01-10 14:45:12 +01:00
parent 4b8c74fd95
commit 09a29908f8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_backoffice_pages.py
View File

@ -930,6 +930,9 @@ def test_backoffice_items_filter(pub):
elif i%4 == 2:
formdata.data['4'] = ['â']
formdata.data['4_display'] = 'â'
else:
formdata.data['4'] = []
formdata.data['4_display'] = None
formdata.store()
app = login(get_app(pub))

5
wcs/backoffice/management.py
View File

@ -1080,8 +1080,9 @@ class FormPage(Directory):
# unnest key/values
exploded_options = {}
for option_keys, option_label in options:
for option_key, option_label in zip(option_keys, option_label.split(', ')):
exploded_options[option_key] = option_label
if option_keys and option_label:
for option_key, option_label in zip(option_keys, option_label.split(', ')):
exploded_options[option_key] = option_label
options = list(sorted(exploded_options.items(), key=lambda x: x[1]))
options = [(force_str(x), force_str(y)) for x, y in options if x and y]