From 41c49645e2748f26038a07b1d2475fba1a9bd91a Mon Sep 17 00:00:00 2001 From: ddm Date: Fri, 18 Oct 2013 11:28:20 +0200 Subject: [PATCH] [FIX] Refactor SEO models bzr revid: ddm@openerp.com-20131018092820-lqj9yz518262nknr --- addons/website/models/website.py | 10 ++++++++++ addons/website_blog/models/website_blog.py | 14 +++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index b3aaf611ddc..56cbfbd458e 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -393,3 +393,13 @@ class base_language_install(osv.osv): 'target': 'self' } return action + +class SeoMetadata(osv.Model): + _name = 'website.seo.metadata' + _description = 'SEO metadata' + + _columns = { + 'website_meta_title': fields.char("Website meta title", size=70, translate=True), + 'website_meta_description': fields.text("Website meta description", size=160, translate=True), + 'website_meta_keywords': fields.char("Website meta keywords", translate=True), + } diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index 9f4a214a8b9..9ecfe6cafee 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -31,7 +31,7 @@ import difflib class BlogCategory(osv.Model): _name = 'blog.category' _description = 'Blog Category' - _inherit = ['mail.thread'] + _inherit = ['mail.thread', 'website.seo.metadata'] _order = 'name' _columns = { @@ -41,15 +41,13 @@ class BlogCategory(osv.Model): 'blog.post', 'category_id', 'Blogs', ), - 'website_meta_title': fields.char("Website meta title", size=70, translate=True), - 'website_meta_description': fields.text("Website meta description", size=160, translate=True), - 'website_meta_keywords': fields.char("Website meta keywords", translate=True), } class BlogTag(osv.Model): _name = 'blog.tag' _description = 'Blog Tag' + _inherit = ['website.seo.metadata'] _order = 'name' _columns = { @@ -57,16 +55,13 @@ class BlogTag(osv.Model): 'blog_post_ids': fields.many2many( 'blog.post', string='Posts', ), - 'website_meta_title': fields.char("Website meta title", size=70, translate=True), - 'website_meta_description': fields.text("Website meta description", size=160, translate=True), - 'website_meta_keywords': fields.char("Website meta keywords", translate=True), } class BlogPost(osv.Model): _name = "blog.post" _description = "Blog Post" - _inherit = ['mail.thread'] + _inherit = ['mail.thread', 'website.seo.metadata'] _order = 'write_date DESC' # maximum number of characters to display in summary _shorten_max_char = 250 @@ -150,9 +145,6 @@ class BlogPost(osv.Model): 'res.users', 'Last Contributor', select=True, readonly=True, ), - 'website_meta_title': fields.char("Website meta title", size=70, translate=True), - 'website_meta_description': fields.text("Website meta description", size=160, translate=True), - 'website_meta_keywords': fields.char("Website meta keywords", translate=True), } def create_history(self, cr, uid, ids, vals, context=None):