diff --git a/addons/theme_default/__manifest__.py b/addons/theme_default/__manifest__.py index 425d03ac01d..cc864e7fea6 100644 --- a/addons/theme_default/__manifest__.py +++ b/addons/theme_default/__manifest__.py @@ -12,7 +12,7 @@ 'static/description/cover.png', 'static/description/theme_default_screenshot.jpg', ], - 'snippet_lists': { + 'configurator_snippets': { 'homepage': ['s_cover', 's_text_image', 's_numbers'], 'about_us': ['s_text_image', 's_image_text', 's_title', 's_company_team'], 'our_services': ['s_three_columns', 's_quotes_carousel', 's_references'], diff --git a/addons/website/models/ir_module_module.py b/addons/website/models/ir_module_module.py index e39eabbb884..aad310bf53d 100644 --- a/addons/website/models/ir_module_module.py +++ b/addons/website/models/ir_module_module.py @@ -660,7 +660,7 @@ class IrModuleModule(models.Model): # Configurator # ------------------------------------------------------------ - configurator_snippets = manifest['snippet_lists'] + configurator_snippets = manifest['configurator_snippets'] # Generate general configurator snippet templates create_values = [] diff --git a/addons/website/models/website.py b/addons/website/models/website.py index fcd58c69432..6ea25f9657c 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -350,10 +350,10 @@ class Website(models.Model): return {'cta_btn_text': False, 'cta_btn_href': '/contactus'} @api.model - def get_theme_snippet_lists(self, theme_name): + def get_theme_configurator_snippets(self, theme_name): return { - **get_manifest('theme_default')['snippet_lists'], - **get_manifest(theme_name).get('snippet_lists', {}), + **get_manifest('theme_default')['configurator_snippets'], + **get_manifest(theme_name).get('configurator_snippets', {}), } def configurator_set_menu_links(self, menu_company, module_data): @@ -586,7 +586,7 @@ class Website(models.Model): # Generate text for the pages requested_pages = set(pages_views.keys()).union({'homepage'}) - snippet_lists = website.get_theme_snippet_lists(theme_name) + configurator_snippets = website.get_theme_configurator_snippets(theme_name) industry = kwargs['industry_name'] IrQweb = self.env['ir.qweb'].with_context(website_id=website.id, lang=website.default_lang_id.code) @@ -613,7 +613,7 @@ class Website(models.Model): generated_content = {} for page_code in requested_pages - {'privacy_policy'}: - snippet_list = snippet_lists.get(page_code, []) + snippet_list = configurator_snippets.get(page_code, []) for snippet in snippet_list: render, placeholders = _render_snippet(f'website.configurator_{page_code}_{snippet}') for placeholder in placeholders: @@ -634,7 +634,7 @@ class Website(models.Model): # Configure the pages for page_code in requested_pages: - snippet_list = snippet_lists.get(page_code, []) + snippet_list = configurator_snippets.get(page_code, []) if page_code == 'homepage': page_view_id = self.with_context(website_id=website.id).viewref('website.homepage') else: diff --git a/odoo/addons/base/tests/test_module.py b/odoo/addons/base/tests/test_module.py index 9833d9a58c3..1d2009db54c 100644 --- a/odoo/addons/base/tests/test_module.py +++ b/odoo/addons/base/tests/test_module.py @@ -41,6 +41,7 @@ class TestModuleManifest(BaseCase): 'auto_install': False, 'bootstrap': False, 'category': 'Uncategorized', + 'configurator_snippets': {}, 'countries': [], 'data': [], 'demo': [], @@ -61,7 +62,6 @@ class TestModuleManifest(BaseCase): 'post_load': None, 'pre_init_hook': '', 'sequence': 100, - 'snippet_lists': {}, 'summary': '', 'test': [], 'update_xml': [], diff --git a/odoo/modules/module.py b/odoo/modules/module.py index f18f25dd5b0..a12fd5e9a41 100644 --- a/odoo/modules/module.py +++ b/odoo/modules/module.py @@ -32,6 +32,7 @@ _DEFAULT_MANIFEST = { 'author': 'Odoo S.A.', 'auto_install': False, 'category': 'Uncategorized', + 'configurator_snippets': {}, # website themes 'countries': [], 'data': [], 'demo': [], @@ -52,7 +53,6 @@ _DEFAULT_MANIFEST = { 'post_load': None, 'pre_init_hook': '', 'sequence': 100, - 'snippet_lists': {}, # website themes 'summary': '', 'test': [], 'update_xml': [],