1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Merge branch 'develop' into 3428-cache-invalidation

This commit is contained in:
John Anderson
2019-08-20 17:35:54 -04:00
32 changed files with 992 additions and 688 deletions

View File

@ -525,7 +525,7 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
model = VirtualMachine
field_order = [
'q', 'cluster_group', 'cluster_type', 'cluster_id', 'status', 'role', 'region', 'site', 'tenant_group',
'tenant', 'platform',
'tenant', 'platform', 'mac_address',
]
q = forms.CharField(
required=False,
@ -606,6 +606,10 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
null_option=True,
)
)
mac_address = forms.CharField(
required=False,
label='MAC address'
)
#