diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index dcdde0d60..76de832da 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -895,7 +895,6 @@ class RackElevationFilterForm(RackFilterForm): queryset=Rack.objects.all(), label=_('Rack'), required=False, - display_field='display_name', query_params={ 'site_id': '$site_id', 'location_id': '$location_id', @@ -939,7 +938,6 @@ class RackReservationForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): ) rack = DynamicModelChoiceField( queryset=Rack.objects.all(), - display_field='display_name', query_params={ 'site_id': '$site', 'location_id': 'location', @@ -1076,7 +1074,6 @@ class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm): user_id = DynamicModelMultipleChoiceField( queryset=User.objects.all(), required=False, - display_field='username', label='User', widget=APISelectMultiple( api_url='/api/users/users/', @@ -1276,7 +1273,6 @@ class ComponentTemplateCreateForm(BootstrapMixin, ComponentForm): ) device_type = DynamicModelChoiceField( queryset=DeviceType.objects.all(), - display_field='model', query_params={ 'manufacturer_id': '$manufacturer' } @@ -2030,7 +2026,6 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): location = DynamicModelChoiceField( queryset=Location.objects.all(), required=False, - display_field='display_name', query_params={ 'site_id': '$site' }, @@ -2041,7 +2036,6 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): rack = DynamicModelChoiceField( queryset=Rack.objects.all(), required=False, - display_field='display_name', query_params={ 'site_id': '$site', 'location_id': 'location', @@ -2067,7 +2061,6 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): ) device_type = DynamicModelChoiceField( queryset=DeviceType.objects.all(), - display_field='model', query_params={ 'manufacturer_id': '$manufacturer' } @@ -2343,7 +2336,6 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF device_type = DynamicModelChoiceField( queryset=DeviceType.objects.all(), required=False, - display_field='model', query_params={ 'manufacturer_id': '$manufacturer' } @@ -2429,7 +2421,6 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt device_type_id = DynamicModelMultipleChoiceField( queryset=DeviceType.objects.all(), required=False, - display_field='model', query_params={ 'manufacturer_id': '$manufacturer_id' }, @@ -2518,8 +2509,7 @@ class ComponentCreateForm(BootstrapMixin, CustomFieldForm, ComponentForm): Base form for the creation of device components (models subclassed from ComponentModel). """ device = DynamicModelChoiceField( - queryset=Device.objects.all(), - display_field='display_name' + queryset=Device.objects.all() ) description = forms.CharField( max_length=100, @@ -3049,7 +3039,6 @@ class InterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm): queryset=Interface.objects.all(), required=False, label='Parent interface', - display_field='display_name', query_params={ 'kind': 'physical', } @@ -3058,7 +3047,6 @@ class InterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm): queryset=Interface.objects.all(), required=False, label='LAG interface', - display_field='display_name', query_params={ 'type': 'lag', } @@ -3067,7 +3055,6 @@ class InterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm): queryset=VLAN.objects.all(), required=False, label='Untagged VLAN', - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -3077,7 +3064,6 @@ class InterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm): queryset=VLAN.objects.all(), required=False, label='Tagged VLANs', - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -3133,7 +3119,6 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm): parent = DynamicModelChoiceField( queryset=Interface.objects.all(), required=False, - display_field='display_name', query_params={ 'device_id': '$device', 'kind': 'physical', @@ -3142,7 +3127,6 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm): lag = DynamicModelChoiceField( queryset=Interface.objects.all(), required=False, - display_field='display_name', query_params={ 'device_id': '$device', 'type': 'lag', @@ -3171,7 +3155,6 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm): untagged_vlan = DynamicModelChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -3180,7 +3163,6 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm): tagged_vlans = DynamicModelMultipleChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -3237,7 +3219,6 @@ class InterfaceBulkEditForm( parent = DynamicModelChoiceField( queryset=Interface.objects.all(), required=False, - display_field='display_name', query_params={ 'kind': 'physical', } @@ -3245,7 +3226,6 @@ class InterfaceBulkEditForm( lag = DynamicModelChoiceField( queryset=Interface.objects.all(), required=False, - display_field='display_name', query_params={ 'type': 'lag', } @@ -3262,7 +3242,6 @@ class InterfaceBulkEditForm( untagged_vlan = DynamicModelChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -3271,7 +3250,6 @@ class InterfaceBulkEditForm( tagged_vlans = DynamicModelMultipleChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -3781,8 +3759,7 @@ class DeviceBayCSVForm(CustomFieldModelCSVForm): class InventoryItemForm(BootstrapMixin, CustomFieldModelForm): device = DynamicModelChoiceField( - queryset=Device.objects.all(), - display_field='display_name' + queryset=Device.objects.all() ) parent = DynamicModelChoiceField( queryset=InventoryItem.objects.all(), @@ -3939,7 +3916,6 @@ class ConnectCableToDeviceForm(BootstrapMixin, CustomFieldModelForm): queryset=Rack.objects.all(), label='Rack', required=False, - display_field='display_name', null_option='None', query_params={ 'site_id': '$termination_b_site' @@ -3949,7 +3925,6 @@ class ConnectCableToDeviceForm(BootstrapMixin, CustomFieldModelForm): queryset=Device.objects.all(), label='Device', required=False, - display_field='display_name', query_params={ 'site_id': '$termination_b_site', 'rack_id': '$termination_b_rack', @@ -4083,7 +4058,6 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, CustomFieldModelForm) termination_b_circuit = DynamicModelChoiceField( queryset=Circuit.objects.all(), label='Circuit', - display_field='cid', query_params={ 'provider_id': '$termination_b_provider', 'site_id': '$termination_b_site', @@ -4092,7 +4066,6 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, CustomFieldModelForm) termination_b_id = DynamicModelChoiceField( queryset=CircuitTermination.objects.all(), label='Side', - display_field='term_side', disabled_indicator='_occupied', query_params={ 'circuit_id': '$termination_b_circuit' @@ -4139,7 +4112,6 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, CustomFieldModelForm): queryset=Location.objects.all(), label='Location', required=False, - display_field='cid', query_params={ 'site_id': '$termination_b_site' } @@ -4525,7 +4497,6 @@ class VirtualChassisCreateForm(BootstrapMixin, CustomFieldModelForm): queryset=Rack.objects.all(), required=False, null_option='None', - display_field='display_name', query_params={ 'site_id': '$site' } @@ -4533,7 +4504,6 @@ class VirtualChassisCreateForm(BootstrapMixin, CustomFieldModelForm): members = DynamicModelMultipleChoiceField( queryset=Device.objects.all(), required=False, - display_field='display_name', query_params={ 'site_id': '$site', 'rack_id': '$rack', @@ -4675,14 +4645,12 @@ class VCMemberSelectForm(BootstrapMixin, forms.Form): queryset=Rack.objects.all(), required=False, null_option='None', - display_field='display_name', query_params={ 'site_id': '$site' } ) device = DynamicModelChoiceField( queryset=Device.objects.all(), - display_field='display_name', query_params={ 'site_id': '$site', 'rack_id': '$rack', @@ -4943,7 +4911,6 @@ class PowerFeedForm(BootstrapMixin, CustomFieldModelForm): rack = DynamicModelChoiceField( queryset=Rack.objects.all(), required=False, - display_field='display_name', query_params={ 'site_id': '$site' } @@ -5054,7 +5021,6 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd rack = DynamicModelChoiceField( queryset=Rack.objects.all(), required=False, - display_field='display_name' ) status = forms.ChoiceField( choices=add_blank_choice(PowerFeedStatusChoices), diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index b735588dc..9b65645ad 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -399,7 +399,6 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form): user_id = DynamicModelMultipleChoiceField( queryset=User.objects.all(), required=False, - display_field='username', label=_('User'), widget=APISelectMultiple( api_url='/api/users/users/', @@ -408,7 +407,6 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form): changed_object_type_id = DynamicModelMultipleChoiceField( queryset=ContentType.objects.all(), required=False, - display_field='display_name', label=_('Object Type'), widget=APISelectMultiple( api_url='/api/extras/content-types/', diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 5bd967ee1..0262d85dd 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -394,8 +394,7 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, - label='VRF', - display_field='display_name' + label='VRF' ) region = DynamicModelChoiceField( queryset=Region.objects.all(), @@ -436,7 +435,6 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): queryset=VLAN.objects.all(), required=False, label='VLAN', - display_field='display_name', query_params={ 'site_id': '$site', 'group_id': '$vlan_group', @@ -555,8 +553,7 @@ class PrefixBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, - label='VRF', - display_field='display_name' + label='VRF' ) prefix_length = forms.IntegerField( min_value=PREFIX_LENGTH_MIN, @@ -685,7 +682,6 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel device = DynamicModelChoiceField( queryset=Device.objects.all(), required=False, - display_field='display_name', initial_params={ 'interfaces': '$interface' } @@ -715,8 +711,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, - label='VRF', - display_field='display_name' + label='VRF' ) nat_region = DynamicModelChoiceField( queryset=Region.objects.all(), @@ -747,7 +742,6 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel queryset=Rack.objects.all(), required=False, label='Rack', - display_field='display_name', null_option='None', query_params={ 'site_id': '$site' @@ -757,7 +751,6 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel queryset=Device.objects.all(), required=False, label='Device', - display_field='display_name', query_params={ 'site_id': '$site', 'rack_id': '$nat_rack', @@ -779,14 +772,12 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel nat_vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, - label='VRF', - display_field='display_name' + label='VRF' ) nat_inside = DynamicModelChoiceField( queryset=IPAddress.objects.all(), required=False, label='IP Address', - display_field='address', query_params={ 'device_id': '$nat_device', 'virtual_machine_id': '$nat_virtual_machine', @@ -895,8 +886,7 @@ class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, - label='VRF', - display_field='display_name' + label='VRF' ) tags = DynamicModelMultipleChoiceField( queryset=Tag.objects.all(), @@ -1027,8 +1017,7 @@ class IPAddressBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, - label='VRF', - display_field='display_name' + label='VRF' ) mask_length = forms.IntegerField( min_value=IPADDRESS_MASK_LENGTH_MIN, diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py index 6cb7a377b..b5fc85ce6 100644 --- a/netbox/secrets/forms.py +++ b/netbox/secrets/forms.py @@ -80,8 +80,7 @@ class SecretRoleBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): class SecretForm(BootstrapMixin, CustomFieldModelForm): device = DynamicModelChoiceField( queryset=Device.objects.all(), - required=False, - display_field='display_name' + required=False ) virtual_machine = DynamicModelChoiceField( queryset=VirtualMachine.objects.all(), diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py index dc5be0aac..05f4b4e7e 100644 --- a/netbox/utilities/forms/fields.py +++ b/netbox/utilities/forms/fields.py @@ -276,7 +276,7 @@ class DynamicModelChoiceMixin: filter = django_filters.ModelChoiceFilter widget = widgets.APISelect - def __init__(self, display_field='name', query_params=None, initial_params=None, null_option=None, + def __init__(self, display_field='display', query_params=None, initial_params=None, null_option=None, disabled_indicator=None, brief_mode=True, *args, **kwargs): self.display_field = display_field self.query_params = query_params or {} diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index 36b581dcc..95e1d2dc1 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -281,14 +281,12 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form): queryset=Rack.objects.all(), required=False, null_option='None', - display_field='display_name', query_params={ 'site_id': '$site' } ) devices = DynamicModelMultipleChoiceField( queryset=Device.objects.all(), - display_field='display_name', query_params={ 'site_id': '$site', 'rack_id': '$rack', @@ -609,7 +607,6 @@ class VMInterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm) queryset=VLAN.objects.all(), required=False, label='Untagged VLAN', - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -619,7 +616,6 @@ class VMInterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm) queryset=VLAN.objects.all(), required=False, label='Tagged VLANs', - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -694,7 +690,6 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm): untagged_vlan = DynamicModelChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -703,7 +698,6 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm): tagged_vlans = DynamicModelMultipleChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -784,7 +778,6 @@ class VMInterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): untagged_vlan = DynamicModelChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null', @@ -793,7 +786,6 @@ class VMInterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): tagged_vlans = DynamicModelMultipleChoiceField( queryset=VLAN.objects.all(), required=False, - display_field='display_name', brief_mode=False, query_params={ 'site_id': 'null',