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

Fixes #6626: Fix site field on VM search form; add site group

Browse Source
This commit is contained in:
jeremystretch
2021-06-21 08:38:46 -04:00
parent 697161beb1
commit fb379b63ec
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/release-notes/version-2.11.md
View File

@ -1,5 +1,13 @@
# NetBox v2.11 # NetBox v2.11
## v2.11.8 (FUTURE)
### Bug Fixes
* [#6626](https://github.com/netbox-community/netbox/issues/6626) - Fix site field on VM search form; add site group
---
## v2.11.7 (2021-06-16) ## v2.11.7 (2021-06-16)
### Enhancements ### Enhancements

14
netbox/virtualization/forms.py
View File

@ -527,8 +527,8 @@ class VirtualMachineBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldB
class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm): class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
model = VirtualMachine model = VirtualMachine
field_order = [ field_order = [
'q', 'cluster_group_id', 'cluster_type_id', 'cluster_id', 'status', 'role_id', 'region_id', 'site_id', 'q', 'cluster_group_id', 'cluster_type_id', 'cluster_id', 'status', 'role_id', 'region_id', 'site_group_id',
'tenant_group_id', 'tenant_id', 'platform_id', 'mac_address', 'site_id', 'tenant_group_id', 'tenant_id', 'platform_id', 'mac_address',
] ]
q = forms.CharField( q = forms.CharField(
required=False, required=False,
@ -556,14 +556,20 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
required=False, required=False,
label=_('Region') label=_('Region')
) )
site_group_id = DynamicModelMultipleChoiceField(
queryset=SiteGroup.objects.all(),
required=False,
label=_('Site group')
)
site_id = DynamicModelMultipleChoiceField( site_id = DynamicModelMultipleChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
required=False, required=False,
null_option='None', null_option='None',
query_params={ query_params={
'region_id': '$region_id' 'region_id': '$region_id',
'group_id': '$site_group_id',
}, },
label=_('Cluster') label=_('Site')
) )
role_id = DynamicModelMultipleChoiceField( role_id = DynamicModelMultipleChoiceField(
queryset=DeviceRole.objects.all(), queryset=DeviceRole.objects.all(),