From 61a755cf4ae4179fe8ebbfb262cbaf0a4b3d7a67 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 5 Oct 2023 18:00:23 +0200 Subject: ✨ imports: manage ignore_errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ishtar_common/views.py') diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 15e0158da..aec8fa9f4 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1558,10 +1558,10 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView): if not user.pk: raise Http404() q1 = self._queryset_filter(self.model.query_can_access(user)) - q1 = q1.filter(group__isnull=True).order_by("-creation_date", "-pk") + q1 = q1.filter(group__isnull=True).order_by("-end_date", "-creation_date", "-pk") q2 = self._queryset_filter(models.ImportGroup.query_can_access(user)) - q2 = q2.order_by("-creation_date", "-pk") - return list(reversed(sorted(list(q1) + list(q2), key=lambda x: x.creation_date))) + q2 = q2.order_by("-end_date", "-creation_date", "-pk") + return list(reversed(sorted(list(q1) + list(q2), key=lambda x: (x.end_date or x.creation_date)))) def post(self, request, *args, **kwargs): for field in request.POST: -- cgit v1.2.3