Merge pull request #37 from openwisp/search

[admin] Added search fields and list displays

django_ipam/base/admin.py

@@ -22,6 +22,8 @@ class AbstractSubnetAdmin(TimeReadonlyAdminMixin, ModelAdmin):
     change_form_template = "admin/django-ipam/subnet/change_form.html"
     change_list_template = "admin/django-ipam/subnet/change_list.html"
     app_name = "django_ipam"
+    list_display = ('name', 'subnet', 'master_subnet', 'description')
+    search_fields = ['subnet', 'name']
 
     def change_view(self, request, object_id, form_url="", extra_context=None):
         instance = Subnet.objects.get(pk=object_id)
@@ -111,6 +113,9 @@ def __init__(self, *args, **kwargs):
 class AbstractIpAddressAdmin(TimeReadonlyAdminMixin, ModelAdmin):
     form = IpAddressAdminForm
     change_form_template = "admin/django-ipam/ip_address/change_form.html"
+    list_display = ('ip_address', 'subnet', 'description')
+    list_filter = ('subnet',)
+    search_fields = ['ip_address']
 
     class Media:
         js = ('django-ipam/js/ip-request.js',)

django_ipam/base/models.py

@@ -17,7 +17,7 @@ class CsvImportException(Exception):
 
 
 class AbstractSubnet(TimeStampedEditableModel):
-    name = models.CharField(max_length=100, blank=True)
+    name = models.CharField(max_length=100, blank=True, db_index=True)
     subnet = NetworkField(db_index=True,
                           help_text=_('Subnet in CIDR notation, eg: "10.0.0.0/24" '
                                       'for IPv4 and "fdb6:21b:a477::9f7/64" for IPv6'))

django_ipam/migrations/0003_auto_20180719_1849.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.5 on 2018-07-19 18:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_ipam', '0002_auto_20180713_0911'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subnet',
+            name='name',
+            field=models.CharField(blank=True, db_index=True, max_length=100),
+        ),
+    ]