From aea466ec48c13ea8a8022b09cf33c09cd07c157d Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 12 Sep 2016 12:25:56 +0200 Subject: [PATCH] [FIX] website_theme_install: use correct xml_id for theme/hidden category Commit a00ea2755d93cef160a13d4652729e3c655fdbb8 restored correct definition of external id for the theme/hidden category but forgot to adapt its use everywhere. --- .../website_theme_install/models/ir_module_module.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py index e621cb47db5..c14e939dc3c 100644 --- a/addons/website_theme_install/models/ir_module_module.py +++ b/addons/website_theme_install/models/ir_module_module.py @@ -42,10 +42,16 @@ class IrModuleModule(models.Model): @api.multi def button_choose_theme(self): - theme_category_id = self.env.ref('base.module_category_theme').id + theme_category = self.env.ref('base.module_category_theme', False) + hidden_category = self.env.ref('base.module_category_hidden', False) + theme_hidden_category = self.env.ref('base.module_category_theme_hidden', False) + + theme_category_id = theme_category.id if theme_category else 0 + hidden_categories_ids = [hidden_category.id if hidden_category else 0, theme_hidden_category.id if theme_hidden_category else 0] + self.search([ # Uninstall the theme(s) which is (are) installed ('state', '=', 'installed'), - '|', ('category_id', 'not in', [self.env.ref('base.module_category_hidden').id, self.env.ref('website_theme_install.module_category_theme_hidden').id]), ('name', '=', 'theme_default'), + '|', ('category_id', 'not in', hidden_categories_ids), ('name', '=', 'theme_default'), '|', ('category_id', '=', theme_category_id), ('category_id.parent_id', '=', theme_category_id) ]).button_immediate_uninstall()