From 7558e2e786f34e38dbf324ba24644e6ef0e5bc52 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 8 Sep 2014 11:14:44 +0200 Subject: [PATCH] [IMP] distribute branding on @groups instead of disabling edition Avoids 2 rendering passes, and allows editing e.g. events detail page, which couldn't be done (due to groups=public in a mail component) fixes #1994 --- addons/report/models/report.py | 1 - addons/website/views/website_templates.xml | 1 - openerp/addons/base/ir/ir_qweb.py | 8 +------- openerp/addons/base/ir/ir_ui_view.py | 2 +- openerp/http.py | 19 +++---------------- 5 files changed, 5 insertions(+), 26 deletions(-) diff --git a/addons/report/models/report.py b/addons/report/models/report.py index fbb8044f129..38492e09f0c 100644 --- a/addons/report/models/report.py +++ b/addons/report/models/report.py @@ -125,7 +125,6 @@ class Report(osv.Model): user=user, res_company=user.company_id, website=website, - editable_no_editor=_("The preferred way to edit a report is to use the HTML Editor"), ) return view_obj.render(cr, uid, template, values, context=context) diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index f7915b98874..b8b9234a60b 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -59,7 +59,6 @@