Merge v3.1.7

This commit is contained in:
jeremystretch
2022-02-03 12:55:34 -05:00
56 changed files with 758 additions and 142 deletions

View File

@@ -340,6 +340,7 @@ class AggregateBulkDeleteView(generic.BulkDeleteView):
class RoleListView(generic.ObjectListView):
queryset = Role.objects.annotate(
prefix_count=count_related(Prefix, 'role'),
iprange_count=count_related(IPRange, 'role'),
vlan_count=count_related(VLAN, 'role')
)
filterset = filtersets.RoleFilterSet