Closes #1784: Added cluster_type filters for virtual machines
This commit is contained in:
@@ -84,6 +84,17 @@ class VirtualMachineFilter(CustomFieldFilterSet):
|
|||||||
to_field_name='slug',
|
to_field_name='slug',
|
||||||
label='Cluster group (slug)',
|
label='Cluster group (slug)',
|
||||||
)
|
)
|
||||||
|
cluster_type_id = django_filters.ModelMultipleChoiceFilter(
|
||||||
|
name='cluster__type',
|
||||||
|
queryset=ClusterType.objects.all(),
|
||||||
|
label='Cluster type (ID)',
|
||||||
|
)
|
||||||
|
cluster_type = django_filters.ModelMultipleChoiceFilter(
|
||||||
|
name='cluster__type__slug',
|
||||||
|
queryset=ClusterType.objects.all(),
|
||||||
|
to_field_name='slug',
|
||||||
|
label='Cluster type (slug)',
|
||||||
|
)
|
||||||
cluster_id = django_filters.ModelMultipleChoiceFilter(
|
cluster_id = django_filters.ModelMultipleChoiceFilter(
|
||||||
queryset=Cluster.objects.all(),
|
queryset=Cluster.objects.all(),
|
||||||
label='Cluster (ID)',
|
label='Cluster (ID)',
|
||||||
|
@@ -340,6 +340,11 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
|
|||||||
to_field_name='slug',
|
to_field_name='slug',
|
||||||
null_option=(0, 'None')
|
null_option=(0, 'None')
|
||||||
)
|
)
|
||||||
|
cluster_type = FilterChoiceField(
|
||||||
|
queryset=ClusterType.objects.all(),
|
||||||
|
to_field_name='slug',
|
||||||
|
null_option=(0, 'None')
|
||||||
|
)
|
||||||
cluster_id = FilterChoiceField(
|
cluster_id = FilterChoiceField(
|
||||||
queryset=Cluster.objects.annotate(filter_count=Count('virtual_machines')),
|
queryset=Cluster.objects.annotate(filter_count=Count('virtual_machines')),
|
||||||
label='Cluster'
|
label='Cluster'
|
||||||
|
Reference in New Issue
Block a user