diff options
| author | Kirill Yakovenko <kirill.yakovenko@gmail.com> | 2016-11-01 22:45:49 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 22:45:49 +0700 |
| commit | d1e883ceb9272e0cb9c26801a706da12f1cebb6a (patch) | |
| tree | b7bc1c3a9b5ac46ae15ff373d2c896a9e2efd409 /omaha_server/omaha/views_admin.py | |
| parent | b2907055db8037ef0701fc10b5a0fb865fd82afd (diff) | |
| parent | 9e468645314a1a9f5108e492fc0906b52638964f (diff) | |
| download | omaha-server-master.zip omaha-server-master.tar.gz omaha-server-master.tar.bz2 | |
Merge pull request #230 from Crystalnix/devHEADorigin/masterorigin/HEADmaster
Sortable columns, PATCH request for versions, Hotfixs
Diffstat (limited to 'omaha_server/omaha/views_admin.py')
| -rw-r--r-- | omaha_server/omaha/views_admin.py | 7 |
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) |