From 6647a8a40c122c82d49e5f1e3e29f464ff306622 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 31 Jul 2023 11:54:45 -0400 Subject: [PATCH] PK fields do not need a label --- netbox/dcim/forms/bulk_create.py | 1 - netbox/dcim/forms/bulk_edit.py | 10 ---------- netbox/extras/forms/bulk_edit.py | 9 --------- netbox/netbox/forms/base.py | 1 - netbox/users/forms/model_forms.py | 1 - netbox/virtualization/forms/bulk_create.py | 1 - netbox/virtualization/forms/bulk_edit.py | 1 - netbox/virtualization/forms/model_forms.py | 1 - 8 files changed, 25 deletions(-) diff --git a/netbox/dcim/forms/bulk_create.py b/netbox/dcim/forms/bulk_create.py index 499c1996f..02aa5a3e4 100644 --- a/netbox/dcim/forms/bulk_create.py +++ b/netbox/dcim/forms/bulk_create.py @@ -28,7 +28,6 @@ __all__ = ( class DeviceBulkAddComponentForm(BootstrapMixin, CustomFieldsMixin, ComponentCreateForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=Device.objects.all(), widget=forms.MultipleHiddenInput() ) diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index c7e577a5c..30f6f456d 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -881,7 +881,6 @@ class PowerFeedBulkEditForm(NetBoxModelBulkEditForm): class ConsolePortTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=ConsolePortTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -901,7 +900,6 @@ class ConsolePortTemplateBulkEditForm(BulkEditForm): class ConsoleServerPortTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=ConsoleServerPortTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -925,7 +923,6 @@ class ConsoleServerPortTemplateBulkEditForm(BulkEditForm): class PowerPortTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=PowerPortTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -961,7 +958,6 @@ class PowerPortTemplateBulkEditForm(BulkEditForm): class PowerOutletTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=PowerOutletTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -1013,7 +1009,6 @@ class PowerOutletTemplateBulkEditForm(BulkEditForm): class InterfaceTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=InterfaceTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -1065,7 +1060,6 @@ class InterfaceTemplateBulkEditForm(BulkEditForm): class FrontPortTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=FrontPortTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -1093,7 +1087,6 @@ class FrontPortTemplateBulkEditForm(BulkEditForm): class RearPortTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=RearPortTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -1121,7 +1114,6 @@ class RearPortTemplateBulkEditForm(BulkEditForm): class ModuleBayTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=ModuleBayTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -1140,7 +1132,6 @@ class ModuleBayTemplateBulkEditForm(BulkEditForm): class DeviceBayTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=DeviceBayTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) @@ -1159,7 +1150,6 @@ class DeviceBayTemplateBulkEditForm(BulkEditForm): class InventoryItemTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=InventoryItemTemplate.objects.all(), widget=forms.MultipleHiddenInput() ) diff --git a/netbox/extras/forms/bulk_edit.py b/netbox/extras/forms/bulk_edit.py index 6e646094f..81f75f160 100644 --- a/netbox/extras/forms/bulk_edit.py +++ b/netbox/extras/forms/bulk_edit.py @@ -23,7 +23,6 @@ __all__ = ( class CustomFieldBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=CustomField.objects.all(), widget=forms.MultipleHiddenInput ) @@ -85,7 +84,6 @@ class CustomFieldChoiceSetBulkEditForm(BulkEditForm): class CustomLinkBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=CustomLink.objects.all(), widget=forms.MultipleHiddenInput ) @@ -112,7 +110,6 @@ class CustomLinkBulkEditForm(BulkEditForm): class ExportTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=ExportTemplate.objects.all(), widget=forms.MultipleHiddenInput ) @@ -142,7 +139,6 @@ class ExportTemplateBulkEditForm(BulkEditForm): class SavedFilterBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=SavedFilter.objects.all(), widget=forms.MultipleHiddenInput ) @@ -171,7 +167,6 @@ class SavedFilterBulkEditForm(BulkEditForm): class WebhookBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=Webhook.objects.all(), widget=forms.MultipleHiddenInput ) @@ -233,7 +228,6 @@ class WebhookBulkEditForm(BulkEditForm): class TagBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=Tag.objects.all(), widget=forms.MultipleHiddenInput ) @@ -252,7 +246,6 @@ class TagBulkEditForm(BulkEditForm): class ConfigContextBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=ConfigContext.objects.all(), widget=forms.MultipleHiddenInput ) @@ -277,7 +270,6 @@ class ConfigContextBulkEditForm(BulkEditForm): class ConfigTemplateBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=ConfigTemplate.objects.all(), widget=forms.MultipleHiddenInput ) @@ -292,7 +284,6 @@ class ConfigTemplateBulkEditForm(BulkEditForm): class JournalEntryBulkEditForm(BulkEditForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=JournalEntry.objects.all(), widget=forms.MultipleHiddenInput ) diff --git a/netbox/netbox/forms/base.py b/netbox/netbox/forms/base.py index 98d36dbc2..efa93c37c 100644 --- a/netbox/netbox/forms/base.py +++ b/netbox/netbox/forms/base.py @@ -108,7 +108,6 @@ class NetBoxModelBulkEditForm(BootstrapMixin, CustomFieldsMixin, forms.Form): nullable_fields = () pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=None, # Set from self.model on init widget=forms.MultipleHiddenInput ) diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py index 6ca050110..1cc94b944 100644 --- a/netbox/users/forms/model_forms.py +++ b/netbox/users/forms/model_forms.py @@ -66,7 +66,6 @@ class UserConfigForm(BootstrapMixin, forms.ModelForm, metaclass=UserConfigFormMe ) # List of clearable preferences pk = forms.MultipleChoiceField( - label=_('Pk'), choices=[], required=False ) diff --git a/netbox/virtualization/forms/bulk_create.py b/netbox/virtualization/forms/bulk_create.py index ed24fb101..7153453ec 100644 --- a/netbox/virtualization/forms/bulk_create.py +++ b/netbox/virtualization/forms/bulk_create.py @@ -12,7 +12,6 @@ __all__ = ( class VirtualMachineBulkAddComponentForm(BootstrapMixin, forms.Form): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=VirtualMachine.objects.all(), widget=forms.MultipleHiddenInput() ) diff --git a/netbox/virtualization/forms/bulk_edit.py b/netbox/virtualization/forms/bulk_edit.py index 9dd037930..cdf07c1bc 100644 --- a/netbox/virtualization/forms/bulk_edit.py +++ b/netbox/virtualization/forms/bulk_edit.py @@ -310,7 +310,6 @@ class VMInterfaceBulkEditForm(NetBoxModelBulkEditForm): class VMInterfaceBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=VMInterface.objects.all(), widget=forms.MultipleHiddenInput() ) diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index a082162b0..0c8c98f9f 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -158,7 +158,6 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form): class ClusterRemoveDevicesForm(ConfirmationForm): pk = forms.ModelMultipleChoiceField( - label=_('Pk'), queryset=Device.objects.all(), widget=forms.MultipleHiddenInput() )