External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Show API choice field metadata more correctly for null vs ''

Browse Source
This commit is contained in:
Jeff Bradberry
2020-03-05 16:45:38 -05:00
parent 66c98ca9bc
commit d849e81891
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/metadata.py
View File

@@ -101,8 +101,10 @@ class Metadata(metadata.SimpleMetadata):
(choice_value, choice_name) for choice_value, choice_name in field.choices.items() (choice_value, choice_name) for choice_value, choice_name in field.choices.items()
] ]
if not any(choice in ('', None) for choice, _ in choices): if not any(choice in ('', None) for choice, _ in choices):
if field.allow_blank or (field.allow_null and not isinstance(field, ChoiceNullField)): if field.allow_blank:
choices = [("", "---------")] + choices choices = [("", "---------")] + choices
if field.allow_null and not isinstance(field, ChoiceNullField):
choices = [(None, "---------")] + choices
field_info['choices'] = choices field_info['choices'] = choices
# Indicate if a field is write-only. # Indicate if a field is write-only.