diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 1d984edc409..876517f2e3b 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -252,7 +252,7 @@ class Post(osv.Model): _columns = { 'name': fields.char('Title'), 'forum_id': fields.many2one('forum.forum', 'Forum', required=True), - 'content': fields.html('Content'), + 'content': fields.html('Content', strip_style=True), 'tag_ids': fields.many2many('forum.tag', 'forum_tag_rel', 'forum_id', 'forum_tag_id', 'Tags'), 'state': fields.selection([('active', 'Active'), ('close', 'Close'), ('offensive', 'Offensive')], 'Status'), 'views': fields.integer('Number of Views'), diff --git a/addons/website_partner/models/res_partner.py b/addons/website_partner/models/res_partner.py index 0d3c90f7ad1..3cf7cc8ef76 100644 --- a/addons/website_partner/models/res_partner.py +++ b/addons/website_partner/models/res_partner.py @@ -14,7 +14,8 @@ class WebsiteResPartner(osv.Model): 'website_published': fields.boolean( 'Publish', help="Publish on the website", copy=False), 'website_description': fields.html( - 'Website Partner Full Description' + 'Website Partner Full Description', + strip_style=True ), 'website_short_description': fields.text( 'Website Partner Short Description' diff --git a/openerp/addons/test_new_api/tests/test_related.py b/openerp/addons/test_new_api/tests/test_related.py index b2b65e8b373..b7bb773c056 100644 --- a/openerp/addons/test_new_api/tests/test_related.py +++ b/openerp/addons/test_new_api/tests/test_related.py @@ -146,7 +146,7 @@ class TestHtmlField(common.TransactionCase): % if object.some_field and not object.oriented: % if object.other_field: - + ${object.mako_thing} @@ -173,5 +173,11 @@ class TestHtmlField(common.TransactionCase): # sanitize should have closed tags left open in the original html self.assertIn('
', partner.comment, 'Error in HTML field: content does not seem to have been sanitized despise sanitize=True') self.assertIn('', partner.comment, 'Error in HTML field: content does not seem to have been sanitized despise sanitize=True') + self.assertIn('