[REF] website: use config parameter instead of ir values in settings

Fields like `default_foo` still used ir.values although those are system-wide
parameters and should therefore be stored in ir.config_parameter
table.

When no default_model is set on a field, don't prefix it by `default_`.
This commit is contained in:
Thibault Delavallée
2017-06-19 17:37:38 +02:00
committed by Yannick Tivisse
parent a3301757f0
commit ac23ca499e
3 changed files with 13 additions and 19 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ class WebsiteBackend(http.Controller):
}
}
if has_group_designer:
ga_dashboard = request.env['ir.values'].sudo().get_default('website.config.settings', 'has_google_analytics_dashboard')
ga_dashboard = request.env['ir.config_parameter'].sudo().get_param('website.has_google_analytics_dashboard')
if ga_dashboard:
ga_client_id = request.env['ir.config_parameter'].sudo().get_param('google_management_client_id', default='')
dashboard_data['dashboards']['visits']['ga_client_id'] = ga_client_id
+12 -13
View File
@@ -6,7 +6,6 @@ from odoo.exceptions import AccessDenied
class WebsiteConfigSettings(models.TransientModel):
_name = 'website.config.settings'
_inherit = 'res.config.settings'
@@ -71,20 +70,20 @@ class WebsiteConfigSettings(models.TransientModel):
for config in self:
config.language_count = len(self.language_ids)
def set_has_google_analytics(self):
@api.model
def get_default_fields(self, fields):
if not self.user_has_groups('website.group_website_designer'):
raise AccessDenied()
return self.env['ir.values'].sudo().set_default(
'website.config.settings', 'has_google_analytics', self.has_google_analytics)
return dict(
has_google_analytics=self.env['ir.config_parameter'].sudo().get_param('website.has_google_analytics'),
has_google_analytics_dashboard=self.env['ir.config_parameter'].sudo().get_param('website.has_google_analytics_dashboard'),
has_google_maps=self.env['ir.config_parameter'].sudo().get_param('website.has_google_maps'),
)
def set_has_google_analytics_dashboard(self):
@api.multi
def set_fields(self):
if not self.user_has_groups('website.group_website_designer'):
raise AccessDenied()
return self.env['ir.values'].sudo().set_default(
'website.config.settings', 'has_google_analytics_dashboard', self.has_google_analytics_dashboard)
def set_has_google_maps(self):
if not self.user_has_groups('website.group_website_designer'):
raise AccessDenied()
return self.env['ir.values'].sudo().set_default(
'website.config.settings', 'has_google_maps', self.has_google_maps)
self.env['ir.config_parameter'].sudo().set_param('website.has_google_analytics', self.has_google_analytics)
self.env['ir.config_parameter'].sudo().set_param('website.has_google_analytics_dashboard', self.has_google_analytics_dashboard)
self.env['ir.config_parameter'].sudo().set_param('website.has_google_maps', self.has_google_maps)
-5
View File
@@ -153,11 +153,6 @@ class WebsiteConfigSettings(models.TransientModel):
def set_multi_sales_price(self):
self.env['ir.config_parameter'].sudo().set_param('sale.sale_pricelist_setting', self.sale_pricelist_setting)
@api.multi
def set_sale_tax_defaults(self):
return self.env['ir.values'].sudo().set_default(
'website.config.settings', 'sale_show_tax', self.sale_show_tax)
@api.onchange('sale_delivery_settings')
def _onchange_sale_delivery_settings(self):
if self.sale_delivery_settings == 'none':