Merge branch 'develop' into develop-2.7

2020-01-10 13:33:51 -05:00
parent 69a696a8d6 509a115f68
commit 9f627fd0d3
15 changed files with 385 additions and 77 deletions
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -933,7 +933,7 @@ class IPAddressBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd


 class IPAddressAssignForm(BootstrapMixin, forms.Form):
-    vrf = forms.ModelChoiceField(
+    vrf_id = forms.ModelChoiceField(
        queryset=VRF.objects.all(),
        required=False,
        label='VRF',
@@ -942,8 +942,9 @@ class IPAddressAssignForm(BootstrapMixin, forms.Form):
            api_url="/api/ipam/vrfs/"
        )
    )
-    address = forms.CharField(
-        label='IP Address'
+    q = forms.CharField(
+        required=False,
+        label='Search',
    )