From 61ce1e837010ee3c38d761fa294f4f7950eabb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 3 Jan 2013 11:11:03 +0100 Subject: [PATCH] [IMP] portal: email signature: better error catching for access rights. bzr revid: tde@openerp.com-20130103101103-qbuhqu6sl9l4ta4h --- addons/portal/mail_mail.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py index a6532bf482c..3c9f245e578 100644 --- a/addons/portal/mail_mail.py +++ b/addons/portal/mail_mail.py @@ -24,6 +24,7 @@ from urlparse import urljoin from openerp import SUPERUSER_ID from openerp.osv import osv +from openerp.osv.orm import except_orm from openerp.tools import append_content_to_html from openerp.tools.translate import _ @@ -57,8 +58,8 @@ class mail_mail(osv.Model): 'id': mail.res_id, } url = urljoin(base_url, "?#%s" % (urlencode(url_params))) - text = _("""

Read this document directly in OpenERP

""") % url - except: # TODO: catch good exception + text = _("""

Access this document directly in OpenERP

""") % url + except except_orm, e: text = _("""

Access your messages through our Customer Portal

""") % partner.signup_url # partner not user else: