NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 12:12:53 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #3427 from candlerb/candlerb/3426

Browse Source 
Improve API error handling when a list is given as a choice value
This commit is contained in:
Jeremy Stretch 2019-08-15 15:29:47 -04:00 committed by GitHub
commit aa858fea03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netbox/utilities/api.py
View File

@ -85,9 +85,9 @@ class ChoiceField(Field):
def to_internal_value(self, data):
# Provide an explicit error message if the request is trying to write a dict
if type(data) is dict:
raise ValidationError('Value must be passed directly (e.g. "foo": 123); do not use a dictionary.')
# Provide an explicit error message if the request is trying to write a dict or list
if isinstance(data, (dict, list)):
raise ValidationError('Value must be passed directly (e.g. "foo": 123); do not use a dictionary or list.')
# Check for string representations of boolean/integer values
if hasattr(data, 'lower'):
@ -101,10 +101,13 @@ class ChoiceField(Field):
except ValueError:
pass
if data not in self._choices:
raise ValidationError("{} is not a valid choice.".format(data))
try:
if data in self._choices:
return data
except TypeError: # Input is an unhashable type
pass
return data
raise ValidationError("{} is not a valid choice.".format(data))
@property
def choices(self):