NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Stretch 2018-03-29 09:45:17 -04:00
parent 88adc5ca86
commit 4ec6e52e73
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/tables.py
View File

@ -329,7 +329,7 @@ class IPAddressAssignTable(BaseTable):
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = IPAddress model = IPAddress
fields = ('address', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface') fields = ('address', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface', 'description')
orderable = False orderable = False

4
netbox/ipam/views.py
View File

@ -729,8 +729,8 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
'vrf', 'tenant', 'interface__device', 'interface__virtual_machine' 'vrf', 'tenant', 'interface__device', 'interface__virtual_machine'
).filter( ).filter(
vrf=form.cleaned_data['vrf'], 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) table = tables.IPAddressAssignTable(queryset)
return render(request, 'ipam/ipaddress_assign.html', { return render(request, 'ipam/ipaddress_assign.html', {

2
netbox/templates/ipam/ipaddress_assign.html
View File

@ -39,7 +39,7 @@
</form> </form>
{% if table %} {% if table %}
<div class="row"> <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> <h3>Search Results</h3>
{% include 'utilities/obj_table.html' with table_template='panel_table.html' %} {% include 'utilities/obj_table.html' with table_template='panel_table.html' %}
</div> </div>