From cbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Sun, 6 Jul 2014 16:44:26 +0200 Subject: [MERGE] new v8 api by rco A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes --- addons/website_mail/controllers/email_designer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website_mail/controllers') diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py index a9462f7be7d..0a3e1043fad 100644 --- a/addons/website_mail/controllers/email_designer.py +++ b/addons/website_mail/controllers/email_designer.py @@ -17,6 +17,7 @@ class WebsiteEmailDesigner(http.Controller): 'email' not in model_cols and 'email_from' not in model_cols or \ 'name' not in model_cols and 'subject' not in model_cols: return request.redirect('/') + res_id = int(res_id) obj_ids = request.registry[model].exists(request.cr, request.uid, [res_id], context=request.context) if not obj_ids: return request.redirect('/') @@ -33,7 +34,6 @@ class WebsiteEmailDesigner(http.Controller): body_field = 'body_html' cr, uid, context = request.cr, request.uid, request.context - res_id = int(res_id) record = request.registry[model].browse(cr, uid, res_id, context=context) values = { -- cgit v1.2.3