diff options
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 31d3d9516..2beade02d 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1527,11 +1527,15 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView): current_url = "current_imports" def get_queryset(self): - q = self.model.objects.exclude(state="AC") - if self.request.user.is_superuser: - return q.order_by("-pk") - user = models.IshtarUser.objects.get(pk=self.request.user.pk) - return q.filter(user=user).order_by("-pk") + q1 = self.model.objects.exclude(state="AC") + q2 = models.ImportGroup.objects.exclude(state="AC") + if not self.request.user.is_superuser: + user = models.IshtarUser.objects.get(pk=self.request.user.pk) + q1 = q1.filter(user=user) + q2 = q2.filter(user=user) + q1 = q1.order_by("-creation_date", "-pk") + q2 = q2.order_by("-creation_date", "-pk") + return reversed(sorted(list(q1) + list(q2), key=lambda x: x.creation_date)) def post(self, request, *args, **kwargs): for field in request.POST: @@ -1597,7 +1601,7 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView): return HttpResponseRedirect(reverse(self.current_url)) def get_context_data(self, **kwargs): - dct = super(ImportListView, self).get_context_data(**kwargs) + dct = super().get_context_data(**kwargs) dct.update({ "autorefresh_available": settings.USE_BACKGROUND_TASK, "has_import_table": models.ImporterType.objects.filter(available=True, is_import=True, type='tab').count(), |