From f5e7d53bcec4e0488656e0be0144b4b9a4ec8930 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 7 Aug 2012 18:12:02 +0200 Subject: [PATCH] [IMP] tools.reference_re: support matching model name as well bzr revid: odo@openerp.com-20120807161202-jav73f2kj86pzil4 --- openerp/tools/misc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 3aad91fb7b8..e90fadf0492 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -279,7 +279,11 @@ email_re = re.compile(r""" """, re.VERBOSE) res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE) command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE) -reference_re = re.compile("<.*-open(?:object|erp)-(\\d+).*@(.*)>", re.UNICODE) + +# Updated in 7.0 to match the model name as well +# Typical form of references is +# group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain +reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE) def html2plaintext(html, body_id=None, encoding='utf-8'): """ From an HTML text, convert the HTML to plain text.