[MERGE] forward port of branch 8.0 up to 591e329

[odoo/odoo.git] / addons / website / models / res_config.py

diff --git a/addons/website/models/res_config.py b/addons/website/models/res_config.py
index 1a85d66..bd6f2e9 100644 (file)
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/res_config.py
@@ -20,6 +20,10 @@ class website_config_settings(osv.osv_memory):
         'social_linkedin': fields.related('website_id', 'social_linkedin', type="char", string='LinkedIn Account'),
         'social_youtube': fields.related('website_id', 'social_youtube', type="char", string='Youtube Account'),
         'social_googleplus': fields.related('website_id', 'social_googleplus', type="char", string='Google+ Account'),
+        'compress_html': fields.related('website_id', 'compress_html', type="boolean", string='Compress HTML'),
+        'cdn_activated': fields.related('website_id', 'cdn_activated', type="boolean", string='Use CDN'),
+        'cdn_url': fields.related('website_id', 'cdn_url', type="char", string='CDN Base URL'),
+        'cdn_filters': fields.related('website_id', 'cdn_filters', type="text", string='CDN Filters'),
     }
 
     def on_change_website_id(self, cr, uid, ids, website_id, context=None):