Skip to content

[FIX] website_multi_theme: Proper checking of special views inheritance #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrobaeza merged 1 commit into from
Mar 9, 2018
Merged

[FIX] website_multi_theme: Proper checking of special views inheritance #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion website_multi_theme/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
7 changes: 3 additions & 4 deletions website_multi_theme/models/website.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down