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

Renamed tenancy FilterSets

This commit is contained in:
Jeremy Stretch
2020-01-09 20:40:32 -05:00
parent 15e1f62919
commit a77fadd114
5 changed files with 13 additions and 13 deletions

View File

@ -28,7 +28,7 @@ from ipam.tables import AggregateTable, IPAddressTable, PrefixTable, VLANTable,
from secrets.filters import SecretFilterSet
from secrets.models import Secret
from secrets.tables import SecretTable
from tenancy.filters import TenantFilter
from tenancy.filters import TenantFilterSet
from tenancy.models import Tenant
from tenancy.tables import TenantTable
from virtualization.filters import ClusterFilter, VirtualMachineFilter
@ -187,7 +187,7 @@ SEARCH_TYPES = OrderedDict((
('tenant', {
'permission': 'tenancy.view_tenant',
'queryset': Tenant.objects.prefetch_related('group'),
'filter': TenantFilter,
'filter': TenantFilterSet,
'table': TenantTable,
'url': 'tenancy:tenant_list',
}),

View File

@ -27,7 +27,7 @@ class TenantGroupViewSet(ModelViewSet):
tenant_count=get_subquery(Tenant, 'group')
)
serializer_class = serializers.TenantGroupSerializer
filterset_class = filters.TenantGroupFilter
filterset_class = filters.TenantGroupFilterSet
#
@ -49,4 +49,4 @@ class TenantViewSet(CustomFieldModelViewSet):
vrf_count=get_subquery(VRF, 'tenant')
)
serializer_class = serializers.TenantSerializer
filterset_class = filters.TenantFilter
filterset_class = filters.TenantFilterSet

View File

@ -7,19 +7,19 @@ from .models import Tenant, TenantGroup
__all__ = (
'TenantFilter',
'TenantGroupFilter',
'TenantFilterSet',
'TenantGroupFilterSet',
)
class TenantGroupFilter(NameSlugSearchFilterSet):
class TenantGroupFilterSet(NameSlugSearchFilterSet):
class Meta:
model = TenantGroup
fields = ['id', 'name', 'slug']
class TenantFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
class TenantFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'

View File

@ -6,7 +6,7 @@ from tenancy.models import Tenant, TenantGroup
class TenantGroupTestCase(TestCase):
queryset = TenantGroup.objects.all()
filterset = TenantGroupFilter
filterset = TenantGroupFilterSet
@classmethod
def setUpTestData(cls):
@ -34,7 +34,7 @@ class TenantGroupTestCase(TestCase):
class TenantTestCase(TestCase):
queryset = Tenant.objects.all()
filterset = TenantFilter
filterset = TenantFilterSet
@classmethod
def setUpTestData(cls):

View File

@ -57,7 +57,7 @@ class TenantGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
class TenantListView(PermissionRequiredMixin, ObjectListView):
permission_required = 'tenancy.view_tenant'
queryset = Tenant.objects.prefetch_related('group')
filter = filters.TenantFilter
filter = filters.TenantFilterSet
filter_form = forms.TenantFilterForm
table = tables.TenantTable
template_name = 'tenancy/tenant_list.html'
@ -117,7 +117,7 @@ class TenantBulkImportView(PermissionRequiredMixin, BulkImportView):
class TenantBulkEditView(PermissionRequiredMixin, BulkEditView):
permission_required = 'tenancy.change_tenant'
queryset = Tenant.objects.prefetch_related('group')
filter = filters.TenantFilter
filter = filters.TenantFilterSet
table = tables.TenantTable
form = forms.TenantBulkEditForm
default_return_url = 'tenancy:tenant_list'
@ -126,6 +126,6 @@ class TenantBulkEditView(PermissionRequiredMixin, BulkEditView):
class TenantBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
permission_required = 'tenancy.delete_tenant'
queryset = Tenant.objects.prefetch_related('group')
filter = filters.TenantFilter
filter = filters.TenantFilterSet
table = tables.TenantTable
default_return_url = 'tenancy:tenant_list'