|
@@ -1,4 +1,5 @@
|
|
|
from django import forms
|
|
from django import forms
|
|
|
|
|
+from django.conf import settings
|
|
|
from django.contrib.auth.models import User
|
|
from django.contrib.auth.models import User
|
|
|
from django.utils.translation import gettext as _
|
|
from django.utils.translation import gettext as _
|
|
|
from timezone_field import TimeZoneFormField
|
|
from timezone_field import TimeZoneFormField
|
|
@@ -1292,8 +1293,13 @@ class InterfaceBulkEditForm(
|
|
|
break
|
|
break
|
|
|
|
|
|
|
|
if site is not None:
|
|
if site is not None:
|
|
|
- self.fields['untagged_vlan'].widget.add_query_param('site_id', site.pk)
|
|
|
|
|
- self.fields['tagged_vlans'].widget.add_query_param('site_id', site.pk)
|
|
|
|
|
|
|
+ # Query for VLANs assigned to the same site and VLANs with no site assigned (null).
|
|
|
|
|
+ self.fields['untagged_vlan'].widget.add_query_param(
|
|
|
|
|
+ 'site_id', [site.pk, settings.FILTERS_NULL_CHOICE_VALUE]
|
|
|
|
|
+ )
|
|
|
|
|
+ self.fields['tagged_vlans'].widget.add_query_param(
|
|
|
|
|
+ 'site_id', [site.pk, settings.FILTERS_NULL_CHOICE_VALUE]
|
|
|
|
|
+ )
|
|
|
|
|
|
|
|
self.fields['parent'].choices = ()
|
|
self.fields['parent'].choices = ()
|
|
|
self.fields['parent'].widget.attrs['disabled'] = True
|
|
self.fields['parent'].widget.attrs['disabled'] = True
|