✨ Import group: archive

1 files changed, 7 insertions, 8 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 901ebc9b8..4a76207f6 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1549,9 +1549,12 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView):
     page_name = _("Current imports")
     current_url = "current_imports"
 
+    def _queryset_filter(self, query):
+        return query.exclude(state="AC")
+
     def get_queryset(self):
-        q1 = self.model.objects.exclude(state="AC")
-        q2 = models.ImportGroup.objects.exclude(state="AC")
+        q1 = self._queryset_filter(self.model.objects)
+        q2 = self._queryset_filter(models.ImportGroup.objects)
         if not self.request.user.is_superuser:
             user = models.IshtarUser.objects.get(pk=self.request.user.pk)
             q1 = q1.filter(user=user)
@@ -2044,12 +2047,8 @@ class ImportOldListView(ImportListView):
     page_name = _("Old imports")
     current_url = "old_imports"
 
-    def get_queryset(self):
-        q = self.model.objects.filter(state="AC")
-        if self.request.user.is_superuser:
-            return q.order_by("-creation_date")
-        user = models.IshtarUser.objects.get(pk=self.request.user.pk)
-        return q.filter(user=user).order_by("-creation_date")
+    def _queryset_filter(self, query):
+        return query.filter(state="AC")
 
     def get_context_data(self, **kwargs):
         data = super().get_context_data(**kwargs)