summaryrefslogtreecommitdiffstats
path: root/omaha_server/omaha/views_admin.py
diff options
context:
space:
mode:
authorAndrey Mekin <amekin@crystalnix.com>2016-09-26 18:44:35 +0600
committerAndrey Mekin <amekin@crystalnix.com>2016-10-04 16:52:42 +0600
commitd74f6cb1b8313d40ce6f043ef004d27c6ee31366 (patch)
treeb2d4736938f9f86113aa30d9332a5b61bc7016ba /omaha_server/omaha/views_admin.py
parent5004d1501d1350101a740714cdeabfb3b9b1d8ff (diff)
downloadomaha-server-d74f6cb1b8313d40ce6f043ef004d27c6ee31366.zip
omaha-server-d74f6cb1b8313d40ce6f043ef004d27c6ee31366.tar.gz
omaha-server-d74f6cb1b8313d40ce6f043ef004d27c6ee31366.tar.bz2
Make columns on the Version Usage page sortable
Diffstat (limited to 'omaha_server/omaha/views_admin.py')
-rw-r--r--omaha_server/omaha/views_admin.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/omaha_server/omaha/views_admin.py b/omaha_server/omaha/views_admin.py
index 3dbb0e9..f074836 100644
--- a/omaha_server/omaha/views_admin.py
+++ b/omaha_server/omaha/views_admin.py
@@ -131,9 +131,6 @@ class VersionsUsageView(StaffMemberRequiredMixin, SingleTableView):
def get_queryset(self):
qs = super(VersionsUsageView, self).get_queryset()
-
- qs = qs.select_related('request', 'request__os')
- qs = qs.order_by('-request__created')
self.appid = None
try:
@@ -145,7 +142,9 @@ class VersionsUsageView(StaffMemberRequiredMixin, SingleTableView):
qs = qs.filter(events__eventtype__in=[2, 3], events__eventresult=1)
qs = qs.distinct('request__userid').order_by('request__userid', '-request__created')
- return list(qs)
+ qs = qs.only('id')
+ sortable_qs = self.model.objects.filter(id__in=qs).select_related('request', 'request__os')
+ return sortable_qs
def get_context_data(self, **kwargs):
context = super(VersionsUsageView, self).get_context_data(**kwargs)