From 72cb1cbfff1b503722f7c98ae5bba88ce6cb919f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 5 Jul 2018 13:20:27 -0400
Subject: [PATCH] Queryset fixes for virtual chassis

---
 netbox/dcim/views.py   | 2 +-
 netbox/netbox/views.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 6e7aa070c..bee775773 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2075,7 +2075,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
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index e3fd4d4db..f2aa30b9e 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -73,7 +73,7 @@ SEARCH_TYPES = OrderedDict((
         'url': 'dcim:device_list',
     }),
     ('virtualchassis', {
-        'queryset': VirtualChassis.objects.select_related('master'),
+        'queryset': VirtualChassis.objects.select_related('master').annotate(member_count=Count('members')),
         'filter': VirtualChassisFilter,
         'table': VirtualChassisTable,
         'url': 'dcim:virtualchassis_list',