Merge PR #1197 into 15.0

Signed-off-by pedrobaeza
OCA · Aug 10, 2023 · 164298a · 164298a
2 parents 8eba436 + 0267290
commit 164298a
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 467 deletions.
diff --git a/mail_tracking/models/ir_mail_server.py b/mail_tracking/models/ir_mail_server.py
@@ -134,6 +134,8 @@ def send_email(
         smtp_user=None,
         smtp_password=None,
         smtp_encryption=None,
+        smtp_ssl_certificate=None,
+        smtp_ssl_private_key=None,
         smtp_debug=False,
         smtp_session=None,
     ):
@@ -149,6 +151,8 @@ def send_email(
                 smtp_user=smtp_user,
                 smtp_password=smtp_password,
                 smtp_encryption=smtp_encryption,
+                smtp_ssl_certificate=smtp_ssl_certificate,
+                smtp_ssl_private_key=smtp_ssl_private_key,
                 smtp_debug=smtp_debug,
                 smtp_session=smtp_session,
             )

diff --git a/mail_tracking/models/mail_thread.py b/mail_tracking/models/mail_thread.py
@@ -99,46 +99,35 @@ def _fields_view_get(
         res = super()._fields_view_get(
             view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu
         )
-        if view_type not in {"search", "form"}:
+        if view_type != "search":
             return res
         doc = etree.XML(res["arch"])
-        if view_type == "search":
-            # Modify view to add new filter element
-            nodes = doc.xpath("//search")
-            if nodes:
-                # Create filter element
-                new_filter = etree.Element(
-                    "filter",
-                    {
-                        "string": _("Failed sent messages"),
-                        "name": "failed_message_ids",
-                        "domain": str(
+        # Modify view to add new filter element
+        nodes = doc.xpath("//search")
+        if nodes:
+            # Create filter element
+            new_filter = etree.Element(
+                "filter",
+                {
+                    "string": _("Failed sent messages"),
+                    "name": "failed_message_ids",
+                    "domain": str(
+                        [
                             [
-                                [
-                                    "failed_message_ids.mail_tracking_ids.state",
-                                    "in",
-                                    list(self.env["mail.message"].get_failed_states()),
-                                ],
-                                [
-                                    "failed_message_ids.mail_tracking_needs_action",
-                                    "=",
-                                    True,
-                                ],
-                            ]
-                        ),
-                    },
-                )
-                nodes[0].append(etree.Element("separator"))
-                nodes[0].append(new_filter)
-        elif view_type == "form":
-            # Modify view to add new field element
-            nodes = doc.xpath("//field[@name='message_ids' and @widget='mail_thread']")
-            if nodes:
-                # Create field
-                field_failed_messages = etree.Element(
-                    "field",
-                    {"name": "failed_message_ids", "widget": "mail_failed_message"},
-                )
-                nodes[0].addprevious(field_failed_messages)
+                                "failed_message_ids.mail_tracking_ids.state",
+                                "in",
+                                list(self.env["mail.message"].get_failed_states()),
+                            ],
+                            [
+                                "failed_message_ids.mail_tracking_needs_action",
+                                "=",
+                                True,
+                            ],
+                        ]
+                    ),
+                },
+            )
+            nodes[0].append(etree.Element("separator"))
+            nodes[0].append(new_filter)
         res["arch"] = etree.tostring(doc, encoding="unicode")
         return res
diff --git a/mail_tracking/readme/ROADMAP.rst b/mail_tracking/readme/ROADMAP.rst
@@ -1 +1,4 @@
-* Add pivot for tracking events and mail trackings
+* Integrate with the core `mail.notification` model. A soft way would be to write a
+  notification event along with the mail.tracking.event ones. Another way could be
+  to merge both models and build the module features on top of it. This might imply
+  a refactor though.
diff --git a/mail_tracking/static/src/js/chatter.esm.js b/mail_tracking/static/src/js/chatter.esm.js
@@ -7,7 +7,7 @@ import {attr} from "@mail/model/model_field";
 
 registerInstancePatchModel(
     "mail.chatter",
-    "mail/static/src/models/chatter/chatter.js",
+    "mail/static/src/models/chatter/chatter.esm.js",
     {
         async refresh() {
             this._super(...arguments);
@@ -24,8 +24,12 @@ registerInstancePatchModel(
         },
     }
 );
-registerFieldPatchModel("mail.chatter", "mail/static/src/models/chatter/chatter.js", {
-    isMessageFailedBoxVisible: attr({
-        default: true,
-    }),
-});
+registerFieldPatchModel(
+    "mail.chatter",
+    "mail/static/src/models/chatter/chatter.esm.js",
+    {
+        isMessageFailedBoxVisible: attr({
+            default: true,
+        }),
+    }
+);