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

backoffice: remove custom handling of string-"None" values in filters (#48472)

This commit is contained in:
Frédéric Péters 2020-11-13 08:41:05 +01:00
parent 00f1b271b4
commit 93452519fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wcs/backoffice/management.py
View File

@ -1800,7 +1800,7 @@ class FormPage(Directory):
criterias.append(Equal('user_id', filter_field_value))
elif filter_field.type == 'submission-agent-id':
criterias.append(Equal('submission_agent_id', filter_field_value))
elif filter_field.type in ('item', 'items') and filter_field_value not in (None, 'None'):
elif filter_field.type in ('item', 'items') and filter_field_value is not None:
if filter_field.type == 'item':
criterias.append(Equal('f%s' % filter_field.id, filter_field_value))
elif filter_field.type == 'items':
@ -1812,14 +1812,14 @@ class FormPage(Directory):
filter_field_value = option[1]
break
criterias[-1]._label = '%s: %s' % (filter_field.label, filter_field_value)
elif filter_field.type == 'bool' and filter_field_value not in (None, 'None'):
elif filter_field.type == 'bool' and filter_field_value is not None:
if filter_field_value == 'true':
criterias.append(Equal('f%s' % filter_field.id, True))
elif filter_field_value == 'false':
criterias.append(Equal('f%s' % filter_field.id, False))
elif filter_field.type in ('string', 'email') and filter_field_value not in (None, 'None'):
elif filter_field.type in ('string', 'email') and filter_field_value is not None:
criterias.append(Equal('f%s' % filter_field.id, filter_field_value))
elif filter_field.type == 'date' and filter_field_value not in (None, 'None'):
elif filter_field.type == 'date' and filter_field_value is not None:
criterias.append(Equal('f%s' % filter_field.id, filter_field_value))
return criterias