Merge branch 'develop' into develop-2.9

2020-07-08 13:04:57 -04:00
parent 85b284be54 fec3ee6f08
commit 5fd5dbab7b
7 changed files with 73 additions and 23 deletions
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1102,7 +1102,12 @@ class VLANBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor
    )
    site = DynamicModelChoiceField(
        queryset=Site.objects.all(),
-        required=False
+        required=False,
+        widget=APISelect(
+            filter_for={
+                'group': 'site_id'
+            }
+        )
    )
    group = DynamicModelChoiceField(
        queryset=VLANGroup.objects.all(),