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

Cleaned the CustomField choice field

Browse Source
This commit is contained in:
Saria Hajjar 2020-01-23 18:54:37 +00:00
parent 0a5eecd0e3
commit 8f86244b4f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/forms.py
View File

@ -10,7 +10,7 @@ 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,
CSVCustomFieldChoiceField, CommentField, ContentTypeSelect, DatePicker, DateTimePicker, FilterChoiceField, CustomFieldChoiceField, CommentField, ContentTypeSelect, DatePicker, DateTimePicker, FilterChoiceField,
LaxURLField, JSONField, SlugField, StaticSelect2, BOOLEAN_WITH_BLANK_CHOICES, LaxURLField, JSONField, SlugField, StaticSelect2, BOOLEAN_WITH_BLANK_CHOICES,
) )
from .choices import * from .choices import *
@ -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 = CSVCustomFieldChoiceField( field = CustomFieldChoiceField(
choices=choices, coerce=int, required=cf.required, initial=default_choice, widget=StaticSelect2() choices=choices, coerce=int, required=cf.required, initial=default_choice, widget=StaticSelect2()
) )

10
netbox/utilities/forms.py
View File

@ -442,18 +442,18 @@ class CSVChoiceField(forms.ChoiceField):
return self.choice_values[value] return self.choice_values[value]
class CSVCustomFieldChoiceField(forms.TypedChoiceField): class CustomFieldChoiceField(forms.TypedChoiceField):
""" """
Invert the provided set of choices to take the human-friendly label as input, and return the database value. Accept human-friendly label as input, and return the database value. If the label is not matched, the normal,
value-based input is assumed.
""" """
def __init__(self, choices, *args, **kwargs): def __init__(self, choices, *args, **kwargs):
super().__init__(choices=choices, *args, **kwargs) super().__init__(choices=choices, *args, **kwargs)
self.choice_values = {str(label): value for value, label in unpack_grouped_choices(choices)} self.choice_values = {label: value for value, label in unpack_grouped_choices(choices)}
def clean(self, value): def clean(self, value):
if not value: # Check if the value is actually a label
return None
if value in self.choice_values: if value in self.choice_values:
return self.choice_values[value] return self.choice_values[value]
return super().clean(value) return super().clean(value)