From 5217c8ebe8c0a2cfe4b2e6b8c6da635748eb3ef4 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 11 Dec 2013 15:44:02 +0100 Subject: [PATCH] [IMP] website: remove secure_layout. Inherit with groups for js editor bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7 --- addons/website/controllers/main.py | 5 +- addons/website/views/website_templates.xml | 170 +++++++++--------- .../views/website_blog_templates.xml | 10 +- addons/website_event/views/website_event.xml | 8 +- .../views/website_hr_recruitment.xml | 6 +- addons/website_mail/views/website_mail.xml | 2 +- addons/website_sale/views/website_sale.xml | 9 +- 7 files changed, 103 insertions(+), 107 deletions(-) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index b6d8ac62c91..0171429dd1b 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -119,15 +119,12 @@ class Website(openerp.addons.web.controllers.main.Home): view_model, view_theme_id = imd.get_object_reference( request.cr, request.uid, 'website', 'theme') - view_secure_layout = imd.get_object_reference( - request.cr, request.uid, 'website', 'secure_layout')[1] - view = request.registry.get("ir.ui.view") views = view._views_get(request.cr, request.uid, xml_id, request.context) done = {} result = [] for v in views: - if v.id != view_secure_layout and (v.inherit_option_id and v.inherit_option_id.id != view_theme_id or not optional): + if v.inherit_option_id and v.inherit_option_id.id != view_theme_id or not optional: if v.inherit_option_id.id not in done: result.append({ 'name': v.inherit_option_id.name, diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index cd79a0839c4..c18eceb3134 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -28,97 +28,61 @@ -