From c11cadec533d756977e474a5ed83394cc9920a64 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 27 Jul 2016 12:38:55 +0200 Subject: [PATCH] Make records searchable by ip address --- netbox/dns/filters.py | 8 ++++---- netbox/ipam/views.py | 1 - netbox/templates/dns/record_list.html | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/netbox/dns/filters.py b/netbox/dns/filters.py index 480aa956a..1c0c73389 100644 --- a/netbox/dns/filters.py +++ b/netbox/dns/filters.py @@ -37,15 +37,15 @@ class RecordFilter(django_filters.FilterSet): lookup_type = 'icontains', label = 'Name', ) - name_or_value = django_filters.MethodFilter( - name = 'name_or_value', + name_or_value_or_ip = django_filters.MethodFilter( + name = 'name_or_value_or_ip', ) class Meta: model=Record field = ['name', 'record_type', 'value'] - def filter_name_or_value(self, queryset, value): + def filter_name_or_value_or_ip(self, queryset, value): if not value: return queryset - return queryset.filter(Q(name__icontains=value) | Q(value__icontains=value)) + return queryset.filter(Q(name__icontains=value) | Q(value__icontains=value) | Q(address__address__icontains=value)) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index cfc0d39c8..4c64c5a7c 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -423,7 +423,6 @@ def ipaddress(request, pk): dns_records = Record.objects.filter(address=ipaddress) dns_records_table = RecordBriefTable(dns_records) - return render(request, 'ipam/ipaddress.html', { 'ipaddress': ipaddress, 'parent_prefixes_table': parent_prefixes_table, diff --git a/netbox/templates/dns/record_list.html b/netbox/templates/dns/record_list.html index d642af2c0..4f6b1e65b 100644 --- a/netbox/templates/dns/record_list.html +++ b/netbox/templates/dns/record_list.html @@ -31,7 +31,7 @@
- +