estel/netbox
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-2.10

Browse Source
This commit is contained in:
Jeremy Stretch
2020-11-17 14:35:06 -05:00
parent e72db65be2 8c4d4532a4
commit 6773709c34
6 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/ipam/api/views.py
View File

@@ -90,7 +90,9 @@ class RoleViewSet(ModelViewSet):
#
class PrefixViewSet(CustomFieldModelViewSet):
queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role', 'tags')
queryset = Prefix.objects.prefetch_related(
'site', 'vrf__tenant', 'tenant', 'vlan', 'role', 'tags'
).order_by(*Prefix._meta.ordering)
serializer_class = serializers.PrefixSerializer
filterset_class = filters.PrefixFilterSet
@@ -260,7 +262,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
class IPAddressViewSet(CustomFieldModelViewSet):
queryset = IPAddress.objects.prefetch_related(
'vrf__tenant', 'tenant', 'nat_inside', 'nat_outside', 'tags', 'assigned_object'
)
).order_by(*IPAddress._meta.ordering)
serializer_class = serializers.IPAddressSerializer
filterset_class = filters.IPAddressFilterSet