From 384d978437dd0ce81704990d070ea4c897e97f9f Mon Sep 17 00:00:00 2001 From: Prince Kumar Date: Tue, 17 Oct 2023 18:25:36 +0530 Subject: [PATCH] add dns_name field in the filterset field and remove extra method --- netbox/ipam/filtersets.py | 17 +---------------- netbox/ipam/forms/filtersets.py | 7 +------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 332eb4357..bc9181286 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -618,14 +618,10 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet): role = django_filters.MultipleChoiceFilter( choices=IPAddressRoleChoices ) - dns_name = MultiValueCharFilter( - method='search_by_dns', - label=_('DNS Name'), - ) class Meta: model = IPAddress - fields = ['id', 'description'] + fields = ['id', 'dns_name', 'description'] def search(self, queryset, name, value): if not value.strip(): @@ -742,17 +738,6 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet): assigned_object_id__isnull=True ) - def search_by_dns(self, queryset, name, value): - if not value: - return queryset - - normalized_value = str(value[0]).lower() - - if normalized_value in ('none', 'null'): - return queryset.filter(dns_name='') - - return queryset.filter(dns_name__in=value) - class FHRPGroupFilterSet(NetBoxModelFilterSet): protocol = django_filters.MultipleChoiceFilter( diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index 120044937..aae62ca75 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -359,12 +359,7 @@ class IPAddressFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): ) dns_name = forms.CharField( required=False, - widget=forms.TextInput( - attrs={ - 'placeholder': 'DNS Name', - } - ), - label='DNS Name' + label=_('DNS Name') ) tag = TagFilterField(model)