NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixed import choice name

Browse Source
This commit is contained in:
Saria Hajjar 2020-01-10 14:58:15 +00:00
parent f1d5e28f13
commit 37322fc100
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/forms.py
View File

@ -10,8 +10,8 @@ from dcim.models import DeviceRole, Platform, Region, Site
from tenancy.models import Tenant, TenantGroup from tenancy.models import Tenant, TenantGroup
from utilities.forms import ( from utilities.forms import (
add_blank_choice, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, ColorSelect, add_blank_choice, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, ColorSelect,
CommentField, ContentTypeSelect, DatePicker, DateTimePicker, FilterChoiceField, LaxURLField, JSONField, CSVCustomFieldChoiceField, CommentField, ContentTypeSelect, DatePicker, DateTimePicker, FilterChoiceField,
SlugField, StaticSelect2, BOOLEAN_WITH_BLANK_CHOICES, LaxURLField, JSONField, SlugField, StaticSelect2, BOOLEAN_WITH_BLANK_CHOICES,
) )
from .constants import * from .constants import *
from .models import ConfigContext, CustomField, CustomFieldValue, ImageAttachment, ObjectChange, Tag from .models import ConfigContext, CustomField, CustomFieldValue, ImageAttachment, ObjectChange, Tag
@ -71,7 +71,7 @@ def get_custom_fields_for_model(content_type, filterable_only=False, bulk_edit=F
default_choice = cf.choices.get(value=initial).pk default_choice = cf.choices.get(value=initial).pk
except ObjectDoesNotExist: except ObjectDoesNotExist:
pass pass
field = forms.TypedChoiceField( field = CSVCustomFieldChoiceField(
choices=choices, coerce=int, required=cf.required, initial=default_choice, widget=StaticSelect2() choices=choices, coerce=int, required=cf.required, initial=default_choice, widget=StaticSelect2()
) )

17
netbox/utilities/forms.py
View File

@ -469,6 +469,23 @@ class CSVChoiceField(forms.ChoiceField):
return self.choice_values[value] return self.choice_values[value]
class CSVCustomFieldChoiceField(forms.TypedChoiceField):
"""
Invert the provided set of choices to take the human-friendly label as input, and return the database value.
"""
def __init__(self, choices, *args, **kwargs):
super().__init__(choices=choices, *args, **kwargs)
self.choice_values = {str(label): value for value, label in unpack_grouped_choices(choices)}
def clean(self, value):
if not value:
return None
if value in self.choice_values:
return self.choice_values[value]
return super().clean(value)
class ExpandableNameField(forms.CharField): class ExpandableNameField(forms.CharField):
""" """
A field which allows for numeric range expansion A field which allows for numeric range expansion