diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index 843fc2702a6..a74db47331d 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -295,7 +295,7 @@ News Blogging and posting relevant content 6 - blog + blog fa-rss @@ -317,7 +317,7 @@ Shop Sell more with an eCommerce 9 - online_store + online_store fa-shopping-cart @@ -325,7 +325,7 @@ Events Publish on-site and online events 10 - event + event fa-ticket @@ -347,7 +347,7 @@ eLearning Share knowledge publicly or for a fee 13 - elearning + elearning fa-graduation-cap diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 0dfbb1402a9..e761551eb2f 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -301,7 +301,7 @@ class Website(models.Model): 'description': feature.description, 'type': feature.type, 'icon': feature.icon, - 'website_types_preselection': feature.website_types_preselection, + 'website_config_preselection': feature.website_config_preselection, 'module_state': feature.module_id.state, } for feature in configurator_features] r['logo'] = False diff --git a/addons/website/models/website_configurator_feature.py b/addons/website/models/website_configurator_feature.py index 5baa70af470..aab1857caaa 100644 --- a/addons/website/models/website_configurator_feature.py +++ b/addons/website/models/website_configurator_feature.py @@ -16,7 +16,7 @@ class WebsiteConfiguratorFeature(models.Model): description = fields.Char(translate=True) icon = fields.Char() iap_page_code = fields.Char(help='Page code used to tell IAP website_service for which page a snippet list should be generated') - website_types_preselection = fields.Char(help='Comma-separated list of website type/purpose for which this feature should be pre-selected') + website_config_preselection = fields.Char(help='Comma-separated list of website type/purpose for which this feature should be pre-selected') type = fields.Selection([('page', "Page"), ('app', "App")], compute='_compute_type') page_view_id = fields.Many2one('ir.ui.view', ondelete='cascade') module_id = fields.Many2one('ir.module.module', ondelete='cascade') diff --git a/addons/website/static/src/components/configurator/configurator.js b/addons/website/static/src/components/configurator/configurator.js index e84500d6b64..9d6801538fb 100644 --- a/addons/website/static/src/components/configurator/configurator.js +++ b/addons/website/static/src/components/configurator/configurator.js @@ -357,14 +357,14 @@ const getters = { const actions = { selectWebsiteType({state}, id) { Object.values(state.features).filter((feature) => feature.module_state !== 'installed').forEach((feature) => { - feature.selected = feature.website_types_preselection.includes(WEBSITE_TYPES[id].name); + feature.selected = feature.website_config_preselection.includes(WEBSITE_TYPES[id].name); }); state.selectedType = id; }, selectWebsitePurpose({state}, id) { Object.values(state.features).filter((feature) => feature.module_state !== 'installed').forEach((feature) => { // need to check id, since we set to undefined in mount() to avoid the auto next screen on back button - feature.selected |= id && feature.website_types_preselection.includes(WEBSITE_PURPOSES[id].name); + feature.selected |= id && feature.website_config_preselection.includes(WEBSITE_PURPOSES[id].name); }); state.selectedPurpose = id; }, @@ -458,8 +458,8 @@ async function getInitialState() { const features = {}; results.features.forEach(feature => { features[feature.id] = Object.assign({}, feature, {selected: feature.module_state === 'installed'}); - const wtp = features[feature.id].website_types_preselection; - features[feature.id].website_types_preselection = wtp ? wtp.split(',') : []; + const wtp = features[feature.id].website_config_preselection; + features[feature.id].website_config_preselection = wtp ? wtp.split(',') : []; }); return Object.assign(r, {