From fd1e3e37c2ccaf1053f9de578904ea67d530162f Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Fri, 9 Mar 2018 09:19:01 +0000 Subject: [PATCH] [FIX] website_multi_theme: Proper checking of special views inheritance --- website_multi_theme/__manifest__.py | 2 +- website_multi_theme/models/website.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/website_multi_theme/__manifest__.py b/website_multi_theme/__manifest__.py index 124e280327..4051b95493 100644 --- a/website_multi_theme/__manifest__.py +++ b/website_multi_theme/__manifest__.py @@ -6,7 +6,7 @@ { "name": "Website Multi Theme", "summary": "Support different theme per website", - "version": "10.0.1.0.0", + "version": "10.0.1.0.1", "category": "Website", "website": "https://www.tecnativa.com", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/website_multi_theme/models/website.py b/website_multi_theme/models/website.py index 666f959ac7..bfb3abf908 100644 --- a/website_multi_theme/models/website.py +++ b/website_multi_theme/models/website.py @@ -160,13 +160,12 @@ def _multi_theme_activate(self): False ) # Applied views must inherit from custom assets or layout - if (copied_view.inherit_id and - copied_view.inherit_id < main_views): + if copied_view.inherit_id & main_views: data = etree.fromstring(copied_view.arch) - if copied_view.inherit_id < main_assets_frontend: + if copied_view.inherit_id & main_assets_frontend: copied_view.inherit_id = custom_assets data.attrib["inherit_id"] = custom_assets.key - elif copied_view.inherit_id < main_layout: + elif copied_view.inherit_id & main_layout: copied_view.inherit_id = custom_layout data.attrib["inherit_id"] = custom_layout.key copied_view.arch = etree.tostring(data)