From: Jonas Winkler <jonas@Jonas-PC>
Date: Sun, 19 Feb 2023 22:29:52 +0000 (+0100)
Subject: Merge branch 'dev' into feature/2396-better-mail-actions
X-Git-Tag: v1.14.0-beta.rc1~72^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c5ef111d87c25bb4a0d1de8c33100c35cd80fb1;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev' into feature/2396-better-mail-actions
---

8c5ef111d87c25bb4a0d1de8c33100c35cd80fb1
diff --cc src/paperless_mail/mail.py
index ca09bb6837,52dafde5f9..b49d3c3b5e
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@@ -515,10 -529,9 +515,11 @@@ class MailAccountHandler(LoggingMixin)
                      else None,
                      override_document_type_id=doc_type.id if doc_type else None,
                      override_tag_ids=tag_ids,
+                     override_owner_id=rule.owner.id if rule.owner else None,
                  )
  
 +                consume_tasks.append(consume_task)
 +
                  processed_attachments += 1
              else:
                  self.log(
@@@ -592,16 -594,7 +593,17 @@@
              override_correspondent_id=correspondent.id if correspondent else None,
              override_document_type_id=doc_type.id if doc_type else None,
              override_tag_ids=tag_ids,
+             override_owner_id=rule.owner.id if rule.owner else None,
          )
 +
 +        mail_action_task = apply_mail_action.s(
 +            M=M,
 +            action=get_rule_action(rule),
 +            message_uid=message.uid,
 +            parameter=rule.action_parameter,
 +        )
 +
 +        (consume_task | mail_action_task).delay()
 +
          processed_elements = 1
          return processed_elements