mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Differentiate better between boolean and 0, 1 choices

Browse Source
This commit is contained in:
Dave Cameron
2018-03-08 19:26:41 -05:00
parent b83de7eb11
commit 53e4e74930
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
netbox/utilities/custom_inspectors.py
View File

@ -15,10 +15,16 @@ class CustomChoiceFieldInspector(FieldInspector):
if isinstance(field, ChoiceFieldSerializer):
value_schema = openapi.Schema(type=openapi.TYPE_INTEGER)
if set([None] + list(field._choices.keys())) == {None, True, False}:
# Special case face and connection_status because the only keys for choices are True and False,
# but the underlying field is still a NullBooleanField
value_schema = openapi.Schema(type=openapi.TYPE_BOOLEAN)
choices = list(field._choices.keys())
if set([None] + choices) == {None, True, False}:
# DeviceType.subdevice_role, Device.face and InterfaceConnection.connection_status all need to be
# differentiated since they each have subtly different values in their choice keys.
# - subdevice_role and connection_status are booleans, although subdevice_role includes None
# - face is an integer set {0, 1} which is easily confused with {False, True}
schema_type = openapi.TYPE_INTEGER
if all(type(x) == bool for x in [c for c in choices if c is not None]):
schema_type = openapi.TYPE_BOOLEAN
value_schema = openapi.Schema(type=schema_type)
value_schema['x-nullable'] = True
schema = SwaggerType(type=openapi.TYPE_OBJECT, required=["label", "value"], properties={