NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-21 11:37:21 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Changed to q filter

Browse Source
This commit is contained in:
Saria Hajjar 2020-01-09 16:26:11 +00:00
parent 40625d1299
commit 472486acd6
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/ipam/forms.py
View File

@ -933,7 +933,7 @@ class IPAddressBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
class IPAddressAssignForm(BootstrapMixin, forms.Form): class IPAddressAssignForm(BootstrapMixin, forms.Form):
vrf = forms.ModelChoiceField( vrf_id = forms.ModelChoiceField(
queryset=VRF.objects.all(), queryset=VRF.objects.all(),
required=False, required=False,
label='VRF', label='VRF',
@ -942,13 +942,9 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form):
api_url="/api/ipam/vrfs/" api_url="/api/ipam/vrfs/"
) )
) )
address = forms.CharField( q = forms.CharField(
label='IP Address',
required=False,
)
dns_name = forms.CharField(
label='DNS Name',
required=False, required=False,
label='Search',
) )

12
netbox/ipam/views.py
View File

@ -749,14 +749,12 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
if form.is_valid(): if form.is_valid():
queryset = IPAddress.objects.prefetch_related( addresses = IPAddress.objects.prefetch_related(
'vrf', 'tenant', 'interface__device', 'interface__virtual_machine' 'vrf', 'tenant', 'interface__device', 'interface__virtual_machine'
).filter( )
vrf=form.cleaned_data['vrf'], # Limit to 100 results
address__istartswith=form.cleaned_data['address'], addresses = filters.IPAddressFilter(request.POST, addresses).qs[:100]
dns_name__icontains=form.cleaned_data['dns_name'], table = tables.IPAddressAssignTable(addresses)
)[:100] # Limit to 100 results
table = tables.IPAddressAssignTable(queryset)
return render(request, 'ipam/ipaddress_assign.html', { return render(request, 'ipam/ipaddress_assign.html', {
'form': form, 'form': form,

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

@ -24,9 +24,8 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"><strong>Select IP Address</strong></div> <div class="panel-heading"><strong>Select IP Address</strong></div>
<div class="panel-body"> <div class="panel-body">
{% render_field form.vrf %} {% render_field form.vrf_id %}
{% render_field form.address %} {% render_field form.q %}
{% render_field form.dns_name %}
</div> </div>
</div> </div>
</div> </div>