Просмотр исходного кода

Closes #1990: Improved search function when assigning an IP address to an interface

Jeremy Stretch 8 лет назад
Родитель
Сommit
4ec6e52e73
3 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      netbox/ipam/tables.py
  2. 2 2
      netbox/ipam/views.py
  3. 1 1
      netbox/templates/ipam/ipaddress_assign.html

+ 1 - 1
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
 
 

+ 2 - 2
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', {

+ 1 - 1
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>