Moves where the mail views live and puts the ordering on those

diff --git a/src/documents/views.py b/src/documents/views.py
index 3b2075e25805f55aff24f49f51a011201af23d2f..10225be6fe6b7b958c44b25f783421032851e997 100644 (file)
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -33,10 +33,6 @@ from packaging import version as packaging_version
 from paperless import version
 from paperless.db import GnuPG
 from paperless.views import StandardPagination
-from paperless_mail.models import MailAccount
-from paperless_mail.models import MailRule
-from paperless_mail.serialisers import MailAccountSerializer
-from paperless_mail.serialisers import MailRuleSerializer
 from rest_framework import parsers
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound
@@ -914,37 +910,3 @@ class AcknowledgeTasksView(GenericAPIView):
             return Response({"result": result})
         except Exception:
             return HttpResponseBadRequest()
-
-
-class MailAccountViewSet(ModelViewSet):
-    model = MailAccount
-
-    queryset = MailAccount.objects.all().order_by("pk")
-    serializer_class = MailAccountSerializer
-    pagination_class = StandardPagination
-    permission_classes = (IsAuthenticated,)
-
-    # TODO: user-scoped
-    # def get_queryset(self):
-    #     user = self.request.user
-    #     return MailAccount.objects.filter(user=user)
-
-    # def perform_create(self, serializer):
-    #     serializer.save(user=self.request.user)
-
-
-class MailRuleViewSet(ModelViewSet):
-    model = MailRule
-
-    queryset = MailRule.objects.all().order_by("pk")
-    serializer_class = MailRuleSerializer
-    pagination_class = StandardPagination
-    permission_classes = (IsAuthenticated,)
-
-    # TODO: user-scoped
-    # def get_queryset(self):
-    #     user = self.request.user
-    #     return MailRule.objects.filter(user=user)
-
-    # def perform_create(self, serializer):
-    #     serializer.save(user=self.request.user)

diff --git a/src/paperless_mail/views.py b/src/paperless_mail/views.py
index b91487f1f5095c1b97b873deca70f154c1cda7dd..d86240c7cd31afe7af5957a150beca22eba2e02d 100644 (file)
--- a/src/paperless_mail/views.py
+++ b/src/paperless_mail/views.py
@@ -10,7 +10,7 @@ from rest_framework.viewsets import ModelViewSet
 class MailAccountViewSet(ModelViewSet):
     model = MailAccount
 
-    queryset = MailAccount.objects.all()
+    queryset = MailAccount.objects.all().order_by("pk")
     serializer_class = MailAccountSerializer
     pagination_class = StandardPagination
     permission_classes = (IsAuthenticated,)
@@ -27,7 +27,7 @@ class MailAccountViewSet(ModelViewSet):
 class MailRuleViewSet(ModelViewSet):
     model = MailRule
 
-    queryset = MailRule.objects.all()
+    queryset = MailRule.objects.all().order_by("pk")
     serializer_class = MailRuleSerializer
     pagination_class = StandardPagination
     permission_classes = (IsAuthenticated,)