diff options
| -rw-r--r-- | omaha_server/omaha/tables.py | 6 | ||||
| -rw-r--r-- | omaha_server/omaha/views_admin.py | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/omaha_server/omaha/tables.py b/omaha_server/omaha/tables.py index ea7cc06..e1a4c30 100644 --- a/omaha_server/omaha/tables.py +++ b/omaha_server/omaha/tables.py @@ -75,12 +75,12 @@ class VersionsUsageTable(tables.Table): nextversion = tables.Column(verbose_name='Current Version') last_update = tables.DateTimeColumn(accessor='request.created', order_by='-request__created', verbose_name='Last update') - ip = tables.Column(accessor='request.ip') - platform = tables.Column(accessor='request.os.platform') + ip = tables.Column(accessor='request.ip', verbose_name='IP') + platform = tables.Column(accessor='request.os.platform', verbose_name='Platform') class Meta: model = AppRequest - orderable = False + orderable = True attrs = {'class': 'paleblue table table-striped table-bordered table-hover table-condensed', 'id': 'usage-table'} fields = ('userid', 'nextversion', 'last_update', 'ip', 'platform') 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) |