Skip to content

Commit 3cb41bb

Browse files
Fixes #13849: Fix label resolution during serialization for removed field choices (#13867)
* Fixes #13849: Fix label resolution during serialization for removed field choices * Cleanup
1 parent 099aff5 commit 3cb41bb

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

netbox/netbox/api/fields.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ def validate_empty_values(self, data):
4646
return super().validate_empty_values(data)
4747

4848
def to_representation(self, obj):
49-
if obj == '':
50-
return None
51-
return {
52-
'value': obj,
53-
'label': self._choices[obj],
54-
}
49+
if obj != '':
50+
# Use an empty string in place of the choice label if it cannot be resolved (i.e. because a previously
51+
# configured choice has been removed from FIELD_CHOICES).
52+
return {
53+
'value': obj,
54+
'label': self._choices.get(obj, ''),
55+
}
5556

5657
def to_internal_value(self, data):
5758
if data == '':

0 commit comments

Comments
 (0)