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

Renamed tenancy FilterSets

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/netbox/views.py
View File

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

4
netbox/tenancy/api/views.py
View File

@ -27,7 +27,7 @@ class TenantGroupViewSet(ModelViewSet):
tenant_count=get_subquery(Tenant, 'group') tenant_count=get_subquery(Tenant, 'group')
) )
serializer_class = serializers.TenantGroupSerializer 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') vrf_count=get_subquery(VRF, 'tenant')
) )
serializer_class = serializers.TenantSerializer serializer_class = serializers.TenantSerializer
filterset_class = filters.TenantFilter filterset_class = filters.TenantFilterSet

8
netbox/tenancy/filters.py
View File

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

4
netbox/tenancy/tests/test_filters.py
View File

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

6
netbox/tenancy/views.py
View File

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