فهرست منبع

Fixes #4277: Fix filtering of clusters by tenant

Jeremy Stretch 6 سال پیش
والد
کامیت
5a61bbec26
2فایلهای تغییر یافته به همراه9 افزوده شده و 5 حذف شده
  1. 8 0
      docs/release-notes/version-2.7.md
  2. 1 5
      netbox/virtualization/filters.py

+ 8 - 0
docs/release-notes/version-2.7.md

@@ -1,3 +1,11 @@
+# v2.7.9 (FUTURE)
+
+## Bug Fixes
+
+* [#4277](https://github.com/netbox-community/netbox/issues/4277) - Fix filtering of clusters by tenant
+
+---
+
 # v2.7.8 (2020-02-25)
 # v2.7.8 (2020-02-25)
 
 
 ## Enhancements
 ## Enhancements

+ 1 - 5
netbox/virtualization/filters.py

@@ -34,7 +34,7 @@ class ClusterGroupFilterSet(NameSlugSearchFilterSet):
         fields = ['id', 'name', 'slug']
         fields = ['id', 'name', 'slug']
 
 
 
 
-class ClusterFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet):
+class ClusterFilterSet(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
     id__in = NumericInFilter(
     id__in = NumericInFilter(
         field_name='id',
         field_name='id',
         lookup_expr='in'
         lookup_expr='in'
@@ -84,10 +84,6 @@ class ClusterFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet):
         to_field_name='slug',
         to_field_name='slug',
         label='Cluster type (slug)',
         label='Cluster type (slug)',
     )
     )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        queryset=Tenant.objects.all(),
-        label="Tenant (ID)"
-    )
     tag = TagFilter()
     tag = TagFilter()
 
 
     class Meta:
     class Meta: