diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst index 03a1d60ad..b9715dade 100644 --- a/mail_debrand/README.rst +++ b/mail_debrand/README.rst @@ -101,6 +101,7 @@ Contributors - João Marques - Stefan Rijnhart stefan@opener.amsterdam +- Jord Duineveld jord.duineveld@codeforward.nl Maintainers ----------- diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py index 43545a76f..0511300db 100644 --- a/mail_debrand/__manifest__.py +++ b/mail_debrand/__manifest__.py @@ -12,7 +12,7 @@ ( for powerd by) form all the templates removes any 'odoo' that are in tempalte texts > 20characters """, - "version": "18.0.1.0.1", + "version": "18.0.1.0.2", "category": "Social Network", "website": "https://github.com/OCA/mail", "author": """Tecnativa, ForgeFlow, Onestein, Sodexis, Nexterp Romania, diff --git a/mail_debrand/models/__init__.py b/mail_debrand/models/__init__.py index 1532c7546..67ae1770f 100644 --- a/mail_debrand/models/__init__.py +++ b/mail_debrand/models/__init__.py @@ -1,2 +1,3 @@ -from . import mail_render_mixin from . import mail_mail +from . import mail_render_mixin +from . import mail_thread diff --git a/mail_debrand/models/mail_render_mixin.py b/mail_debrand/models/mail_render_mixin.py index 549782886..8fe50b773 100644 --- a/mail_debrand/models/mail_render_mixin.py +++ b/mail_debrand/models/mail_render_mixin.py @@ -41,10 +41,14 @@ def remove_href_odoo(self, value, to_keep=None): # Remove "Powered by", "using" etc. previous = elem.getprevious() if previous is not None: - previous.tail = etree.CDATA(" ") + previous.tail = None elif parent.text: - parent.text = etree.CDATA(" ") + parent.text = None parent.remove(elem) + # Clean up dangling pipe separator in unfollow span + for span in tree.xpath('//span[@id="mail_unfollow"]'): + if span.text and "|" in span.text: + span.text = None value = etree.tostring( tree, pretty_print=True, method="html", encoding="unicode" ) diff --git a/mail_debrand/models/mail_thread.py b/mail_debrand/models/mail_thread.py new file mode 100644 index 000000000..36f6d0711 --- /dev/null +++ b/mail_debrand/models/mail_thread.py @@ -0,0 +1,15 @@ +# Copyright 2026 Codeforward B.V. - Jord Duineveld +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import models + + +class MailThread(models.AbstractModel): + _inherit = "mail.thread" + + def _notify_by_email_render_layout( + self, message, recipients_group, msg_vals=False, render_values=None + ): + mail_body = super()._notify_by_email_render_layout( + message, recipients_group, msg_vals=msg_vals, render_values=render_values + ) + return self.env["mail.render.mixin"].remove_href_odoo(mail_body or "") diff --git a/mail_debrand/readme/CONTRIBUTORS.md b/mail_debrand/readme/CONTRIBUTORS.md index 4a7f43106..21a480ec0 100644 --- a/mail_debrand/readme/CONTRIBUTORS.md +++ b/mail_debrand/readme/CONTRIBUTORS.md @@ -4,3 +4,4 @@ - Pedro M. Baeza - João Marques - Stefan Rijnhart +- Jord Duineveld diff --git a/mail_debrand/static/description/index.html b/mail_debrand/static/description/index.html index fca686308..32542374e 100644 --- a/mail_debrand/static/description/index.html +++ b/mail_debrand/static/description/index.html @@ -456,6 +456,7 @@

Contributors

  • Stefan Rijnhart stefan@opener.amsterdam
    • +
  • Jord Duineveld jord.duineveld@codeforward.nl