From 42c2274eac1609f8a6cd5466f380864cb0137843 Mon Sep 17 00:00:00 2001 From: mreficent Date: Sun, 19 Aug 2018 18:26:08 +0200 Subject: [PATCH 1/2] [FIX] test_exceptions: Import correctly safe_eval Trying to generate an exception using a safe_eval was failing Introduced at 12634e1 Can be ignored for v10 (fixed at bd00fcd) Closes #26450 --- openerp/addons/test_exceptions/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/test_exceptions/models.py b/openerp/addons/test_exceptions/models.py index e2489e7558d..be14ea1c24e 100644 --- a/openerp/addons/test_exceptions/models.py +++ b/openerp/addons/test_exceptions/models.py @@ -2,7 +2,7 @@ import openerp.exceptions import openerp.osv.orm import openerp.osv.osv -import openerp.tools.safe_eval +from openerp.tools.safe_eval import safe_eval from openerp.exceptions import UserError from openerp.exceptions import except_orm @@ -86,4 +86,4 @@ class m(openerp.osv.osv.Model): def generate_safe_eval(self, cr, uid, ids, f, context): globals_dict = { 'generate': lambda *args: f(cr, uid, ids, context) } - openerp.tools.safe_eval.safe_eval("generate()", mode='exec', globals_dict=globals_dict) + safe_eval("generate()", mode='exec', globals_dict=globals_dict) From f750393030502723b9de7b5efaf272f7f73b9472 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 21 Aug 2018 03:28:59 +0200 Subject: [PATCH 2/2] [FIX] website_forum: properly catch errors for email activation --- addons/website_forum/models/res_users.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py index 0cf5779fcb1..80a977eb103 100644 --- a/addons/website_forum/models/res_users.py +++ b/addons/website_forum/models/res_users.py @@ -76,7 +76,9 @@ class Users(models.Model): params['forum_id'] = forum_id base_url = self.env['ir.config_parameter'].get_param('web.base.url') token_url = base_url + '/forum/validate_email?%s' % urlencode(params) - activation_template.sudo().with_context(token_url=token_url).send_mail(self.id, force_send=True) + with self._cr.savepoint(): + activation_template.sudo().with_context(token_url=token_url).send_mail( + self.id, force_send=True, raise_exception=True) return True @api.one