diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-10-05 18:00:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-02-05 10:51:52 +0100 |
| commit | 90dedc12bcae563a03db4c5951202ee145c4e735 (patch) | |
| tree | 0902fb7d0874774b2ec2e8c2d4d03ca26b060b1e /ishtar_common/views.py | |
| parent | b9097926dfd5aeb2ce211122920298956d802824 (diff) | |
| download | Ishtar-90dedc12bcae563a03db4c5951202ee145c4e735.tar.bz2 Ishtar-90dedc12bcae563a03db4c5951202ee145c4e735.zip | |
✨ imports: manage ignore_errors
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
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: |