From 20778cedce1d1fba21f7dd0812855bda270fce0d Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 18 Mar 2024 12:39:30 +0100 Subject: [PATCH 1/2] [IMP] mail_tracking: Give example that actually works in readme --- mail_tracking/README.rst | 4 ++-- mail_tracking/readme/INSTALL.rst | 2 +- mail_tracking/static/description/index.html | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mail_tracking/README.rst b/mail_tracking/README.rst index 4bb18d7d97..1984c977b4 100644 --- a/mail_tracking/README.rst +++ b/mail_tracking/README.rst @@ -7,7 +7,7 @@ Email tracking !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:7d0822f2344e54b410baa9c231fbd045c780f5d96da47d84e3b645ee12e3df55 + !! source digest: sha256:900b65e7ae35d363f6d5884b49a0a63e14764e2a1cf34e7ccedb70b9ee2ebda1 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -44,7 +44,7 @@ If you're using a multi-database installation (with or without dbfilter option) where /web/databse/selector returns a list of more than one database, then you need to add ``mail_tracking`` addon to wide load addons list (by default, only ``web`` addon), setting ``--load`` option. -For example, ``--load=web,mail_tracking`` +For example, ``--load=web,mail,mail_tracking`` Configuration ============= diff --git a/mail_tracking/readme/INSTALL.rst b/mail_tracking/readme/INSTALL.rst index cb09d4c4bf..49c06e74a0 100644 --- a/mail_tracking/readme/INSTALL.rst +++ b/mail_tracking/readme/INSTALL.rst @@ -2,4 +2,4 @@ If you're using a multi-database installation (with or without dbfilter option) where /web/databse/selector returns a list of more than one database, then you need to add ``mail_tracking`` addon to wide load addons list (by default, only ``web`` addon), setting ``--load`` option. -For example, ``--load=web,mail_tracking`` +For example, ``--load=web,mail,mail_tracking`` diff --git a/mail_tracking/static/description/index.html b/mail_tracking/static/description/index.html index 8e488481bd..732265ef56 100644 --- a/mail_tracking/static/description/index.html +++ b/mail_tracking/static/description/index.html @@ -1,3 +1,4 @@ + @@ -366,7 +367,7 @@

Email tracking

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:7d0822f2344e54b410baa9c231fbd045c780f5d96da47d84e3b645ee12e3df55 +!! source digest: sha256:900b65e7ae35d363f6d5884b49a0a63e14764e2a1cf34e7ccedb70b9ee2ebda1 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runboat

This module shows email notification tracking status for any messages in @@ -398,7 +399,7 @@

Installation

where /web/databse/selector returns a list of more than one database, then you need to add mail_tracking addon to wide load addons list (by default, only web addon), setting --load option. -For example, --load=web,mail_tracking

+For example, --load=web,mail,mail_tracking

Configuration

From b8848c531d32b7d0aba529416991693aa2fe9b5e Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 18 Mar 2024 12:40:20 +0100 Subject: [PATCH 2/2] [FIX] mail_tracking: be closer to what Odoo does in a nodb environment --- mail_tracking/tests/test_mail_tracking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_tracking/tests/test_mail_tracking.py b/mail_tracking/tests/test_mail_tracking.py index 14923ff416..d9510acda5 100644 --- a/mail_tracking/tests/test_mail_tracking.py +++ b/mail_tracking/tests/test_mail_tracking.py @@ -439,7 +439,7 @@ def mock_error_function(*args, **kwargs): controller.mail_tracking_open(db, tracking.id, False) def test_db_env_no_cr(self): - http.request.cr = None + http.request.env = None db = self.env.cr.dbname controller = MailTrackingController() # Cast Cursor to Mock object to avoid raising 'Cursor not closed explicitly' log