Merged v2.3.6

This commit is contained in:
Jeremy Stretch
2018-07-16 12:03:32 -04:00
11 changed files with 51 additions and 11 deletions

View File

@@ -2101,7 +2101,7 @@ class InventoryItemBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
#
class VirtualChassisListView(ObjectListView):
queryset = VirtualChassis.objects.annotate(member_count=Count('members'))
queryset = VirtualChassis.objects.select_related('master').annotate(member_count=Count('members'))
table = tables.VirtualChassisTable
filter = filters.VirtualChassisFilter
filter_form = forms.VirtualChassisFilterForm