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

Closes #10762: Permit selection custom fields to have only one choice

Browse Source
This commit is contained in:
jeremystretch 2023-01-25 10:15:11 -05:00
parent 6f74c5ec03
commit 55b1549895
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/version-3.4.md
View File

@ -2,6 +2,10 @@
## v3.4.4 (FUTURE) ## v3.4.4 (FUTURE)
### Enhancements
* [#10762](https://github.com/netbox-community/netbox/issues/10762) - Permit selection custom fields to have only one choice
### Bug Fixes ### Bug Fixes
* [#11487](https://github.com/netbox-community/netbox/issues/11487) - Remove "set null" option from non-writable custom fields during bulk edit * [#11487](https://github.com/netbox-community/netbox/issues/11487) - Remove "set null" option from non-writable custom fields during bulk edit

9
netbox/extras/models/customfields.py
View File

@ -273,10 +273,13 @@ class CustomField(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLogge
'choices': "Choices may be set only for custom selection fields." 'choices': "Choices may be set only for custom selection fields."
}) })
# A selection field must have at least two choices defined # Selection fields must have at least one choice defined
if self.type == CustomFieldTypeChoices.TYPE_SELECT and self.choices and len(self.choices) < 2: if self.type in (
CustomFieldTypeChoices.TYPE_SELECT,
CustomFieldTypeChoices.TYPE_MULTISELECT
) and not self.choices:
raise ValidationError({ raise ValidationError({
'choices': "Selection fields must specify at least two choices." 'choices': "Selection fields must specify at least one choice."
}) })
# A selection field's default (if any) must be present in its available choices # A selection field's default (if any) must be present in its available choices

1
netbox/extras/tests/test_api.py
View File

@ -101,6 +101,7 @@ class CustomFieldTest(APIViewTestCases.APIViewTestCase):
'content_types': ['dcim.site'], 'content_types': ['dcim.site'],
'name': 'cf6', 'name': 'cf6',
'type': 'select', 'type': 'select',
'choices': ['A', 'B', 'C']
}, },
] ]
bulk_update_data = { bulk_update_data = {