From 4ec6e52e7320011300aaa33ad1199845603593d2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 29 Mar 2018 09:45:17 -0400
Subject: [PATCH] Closes #1990: Improved search function when assigning an IP
 address to an interface

---
 netbox/ipam/tables.py                       | 2 +-
 netbox/ipam/views.py                        | 4 ++--
 netbox/templates/ipam/ipaddress_assign.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index f0b05b3db..08035d549 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -329,7 +329,7 @@ class IPAddressAssignTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = IPAddress
-        fields = ('address', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface')
+        fields = ('address', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface', 'description')
         orderable = False
 
 
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 5c8ce68b6..1d4575e34 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -729,8 +729,8 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
                 'vrf', 'tenant', 'interface__device', 'interface__virtual_machine'
             ).filter(
                 vrf=form.cleaned_data['vrf'],
-                address__net_host=form.cleaned_data['address'],
-            )
+                address__istartswith=form.cleaned_data['address'],
+            )[:100]  # Limit to 100 results
             table = tables.IPAddressAssignTable(queryset)
 
         return render(request, 'ipam/ipaddress_assign.html', {
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index a623a55f3..63b1823f8 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -39,7 +39,7 @@
     </form>
     {% if table %}
         <div class="row">
-            <div class="col-md-10 col-md-offset-1" style="margin-top: 20px">
+            <div class="col-md-12" style="margin-top: 20px">
                 <h3>Search Results</h3>
                 {% include 'utilities/obj_table.html' with table_template='panel_table.html' %}
             </div>