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

Merge branch 'develop' into develop-2.10

Browse Source
This commit is contained in:
Jeremy Stretch
2020-10-09 13:48:29 -04:00
parent 752b099d22 7545599493
commit 96650b0216
36 changed files with 255 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,13 +175,14 @@ class CustomField(models.Model):
# Select
elif self.type == CustomFieldTypeChoices.TYPE_SELECT:
choices = [(c, c) for c in self.choices]
default_choice = self.default if self.default in self.choices else None
if not required:
if not required or default_choice is None:
choices = add_blank_choice(choices)
# Set the initial value to the first available choice (if any)
if set_initial and self.choices:
initial = self.choices[0]
if set_initial and default_choice:
initial = default_choice
field_class = CSVChoiceField if for_csv_import else forms.ChoiceField
field = field_class(