Merge branch 'dev' into feature-permissions

diff --cc src-ui/src/app/app-routing.module.ts
Simple merge

diff --cc src-ui/src/app/app.module.ts
Simple merge

diff --cc src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts
Simple merge

diff --cc src-ui/src/styles.scss
Simple merge

diff --cc src/documents/consumer.py
index ad5a8416aa9ab08f658b77c9b87da6f50fe610fc,bc344abb9d7f8a593f74682570a439e82aec5497..6c736b680e1dfb969a88722717a56069d2e4e961
--- 1/src/documents/consumer.py
--- 2/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@@ -99,8 -100,8 +101,9 @@@ class Consumer(LoggingMixin)
          self.override_correspondent_id = None
          self.override_tag_ids = None
          self.override_document_type_id = None
+         self.override_asn = None
          self.task_id = None
 +        self.owner_id = None
  
          self.channel_layer = get_channel_layer()
  
@@@ -257,7 -279,7 +281,8 @@@
          override_tag_ids=None,
          task_id=None,
          override_created=None,
+         override_asn=None,
 +        override_owner_id=None,
      ) -> Document:
          """
          Return the document object if it was successfully created.
@@@ -271,7 -293,7 +296,8 @@@
          self.override_tag_ids = override_tag_ids
          self.task_id = task_id or str(uuid.uuid4())
          self.override_created = override_created
+         self.override_asn = override_asn
 +        self.override_owner_id = override_owner_id
  
          self._send_progress(0, 100, "STARTING", MESSAGE_NEW_FILE)
  
@@@ -530,11 -553,9 +557,14 @@@
              for tag_id in self.override_tag_ids:
                  document.tags.add(Tag.objects.get(pk=tag_id))
  
+         if self.override_asn:
+             document.archive_serial_number = self.override_asn
+ 
 +        if self.override_owner_id:
 +            document.owner = User.objects.get(
 +                pk=self.override_owner_id,
 +            )
 +
      def _write(self, storage_type, source, target):
          with open(source, "rb") as read_file:
              with open(target, "wb") as write_file:

diff --cc src/documents/index.py
Simple merge

diff --cc src/documents/models.py
Simple merge

diff --cc src/documents/tasks.py
index d52d6e74a77f92b3b65104cc2338f9be64b425ba,77b48e33df92afea33ec0411794082674ea47534..080b9a9d11488a1535f71b107be95a56f9c2adf6
--- 1/src/documents/tasks.py
--- 2/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@@ -187,7 -198,7 +200,8 @@@ def consume_file
          override_tag_ids=override_tag_ids,
          task_id=task_id,
          override_created=override_created,
+         override_asn=asn,
 +        override_owner_id=override_owner_id,
      )
  
      if document:

diff --cc src/documents/tests/test_management_exporter.py
Simple merge

diff --cc src/documents/views.py
index 1bb5a50f083fc475d9e923e299d911daa5c1bdfa,87862fe072332a1e0ed4e3cb0d0c7803cee98c03..b2873694d93a17f95f9d81feba5a0562f8bfeca1
--- 1/src/documents/views.py
--- 2/src/documents/views.py
+++ b/src/documents/views.py
@@@ -194,17 -173,13 +194,17 @@@ class TagViewSet(ModelViewSet)
              return TagSerializer
  
      pagination_class = StandardPagination
 -    permission_classes = (IsAuthenticated,)
 -    filter_backends = (DjangoFilterBackend, OrderingFilter)
 +    permission_classes = (IsAuthenticated, PaperlessObjectPermissions)
 +    filter_backends = (
 +        DjangoFilterBackend,
 +        OrderingFilter,
 +        ObjectOwnedOrGrandtedPermissionsFilter,
 +    )
      filterset_class = TagFilterSet
-     ordering_fields = ("name", "matching_algorithm", "match", "document_count")
+     ordering_fields = ("color", "name", "matching_algorithm", "match", "document_count")
  
  
 -class DocumentTypeViewSet(ModelViewSet):
 +class DocumentTypeViewSet(ModelViewSet, PassUserMixin):
      model = DocumentType
  
      queryset = DocumentType.objects.annotate(

diff --cc src/paperless/settings.py
Simple merge

diff --cc src/paperless_mail/views.py
index edc58ac8962aa65184d51f6fdffa514286b0a7f6,45fc4197e93c5e088f67c44aa9afcd6229a1fc13..85aee8902fd31935b7a8aac4df22873d94bb2a81
--- 1/src/paperless_mail/views.py
--- 2/src/paperless_mail/views.py
+++ b/src/paperless_mail/views.py
@@@ -16,11 -15,19 +16,11 @@@ class MailAccountViewSet(ModelViewSet, 
      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):
 +class MailRuleViewSet(ModelViewSet, PassUserMixin):
      model = MailRule
  
-     queryset = MailRule.objects.all().order_by("pk")
+     queryset = MailRule.objects.all().order_by("order")
      serializer_class = MailRuleSerializer
      pagination_class = StandardPagination
      permission_classes = (IsAuthenticated,)