From 6f94198934a1d0339f3a944d01d80cdb9ede59f8 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 1 Sep 2021 13:52:32 -0400 Subject: [PATCH] #7123: Remove "Global" placeholder for null VRF field --- docs/release-notes/version-3.0.md | 1 + netbox/ipam/forms.py | 19 +------------------ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 2e1f38d6b..341cd1ac4 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -25,6 +25,7 @@ * [#7107](https://github.com/netbox-community/netbox/issues/7107) - Fix missing search button and search results in IP Address assignment "Assign IP" tab * [#7109](https://github.com/netbox-community/netbox/issues/7109) - Ensure human readability of exceptions raised during REST API requests * [#7113](https://github.com/netbox-community/netbox/issues/7113) - Fix IPRange bulk options within Prefix view +* [#7123](https://github.com/netbox-community/netbox/issues/7123) - Remove "Global" placeholder for null VRF field --- diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 5734fffed..4d5b3ad73 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -491,11 +491,6 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): 'status': StaticSelect(), } - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - self.fields['vrf'].empty_label = 'Global' - class PrefixCSVForm(CustomFieldModelCSVForm): vrf = CSVModelChoiceField( @@ -760,11 +755,6 @@ class IPRangeForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): 'status': StaticSelect(), } - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - self.fields['vrf'].empty_label = 'Global' - class IPRangeCSVForm(CustomFieldModelCSVForm): vrf = CSVModelChoiceField( @@ -1026,8 +1016,6 @@ class IPAddressForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): super().__init__(*args, **kwargs) - self.fields['vrf'].empty_label = 'Global' - # Initialize primary_for_parent if IP address is already assigned if self.instance.pk and self.instance.assigned_object: parent = self.instance.assigned_object.parent_object @@ -1102,10 +1090,6 @@ class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): 'role': StaticSelect(), } - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields['vrf'].empty_label = 'Global' - class IPAddressCSVForm(CustomFieldModelCSVForm): vrf = CSVModelChoiceField( @@ -1256,8 +1240,7 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form): vrf_id = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, - label='VRF', - empty_label='Global' + label='VRF' ) q = forms.CharField( required=False,