summaryrefslogtreecommitdiff
path: root/addons/website_theme_install/models
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2016-09-12 12:25:56 +0200
committerqsm-odoo <qsm@odoo.com>2016-09-12 15:33:54 +0200
commitaea466ec48c13ea8a8022b09cf33c09cd07c157d (patch)
tree9128203e58d016262c2ac14968c1b17a1f7a6c28 /addons/website_theme_install/models
parent6fee3fb72ea71a3b4a964e21a0d2aaa0b417c016 (diff)
[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.
Diffstat (limited to 'addons/website_theme_install/models')
-rw-r--r--addons/website_theme_install/models/ir_module_module.py10
1 files 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()