From 20e4f1fc297a91e550466c1fce523f23fe4f5c34 Mon Sep 17 00:00:00 2001 From: ddm Date: Fri, 18 Oct 2013 15:59:26 +0200 Subject: [PATCH] [FIX] SEO 'aware' models bzr revid: ddm@openerp.com-20131018135926-vdmelqsp1ama13st --- addons/website_event/models/event.py | 6 ++---- addons/website_project/__init__.py | 1 + addons/website_project/controllers/main.py | 6 ++++-- addons/website_project/models/__init__.py | 1 + addons/website_project/models/website_project.py | 9 +++++++++ 5 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 addons/website_project/models/__init__.py create mode 100644 addons/website_project/models/website_project.py diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index 237b0fcead2..008ca297906 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -32,7 +32,8 @@ class product(osv.osv): class event(osv.osv): - _inherit = 'event.event' + _name = 'event.event' + _inherit = ['event.event','website.seo.metadata'] _columns = { 'twitter_hashtag': fields.char('Twitter Hashtag'), 'website_published': fields.boolean('Available in the website'), @@ -45,9 +46,6 @@ class event(osv.osv): string='Website Messages', help="Website communication history", ), - '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), } _defaults = { 'website_published': False, diff --git a/addons/website_project/__init__.py b/addons/website_project/__init__.py index 355939a4922..d3e4f782456 100644 --- a/addons/website_project/__init__.py +++ b/addons/website_project/__init__.py @@ -1 +1,2 @@ +import models import controllers \ No newline at end of file diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py index 45141fdd388..8adf19a885c 100644 --- a/addons/website_project/controllers/main.py +++ b/addons/website_project/controllers/main.py @@ -47,7 +47,8 @@ class website_project(http.Controller): project = project_obj.browse(request.cr, request.uid, project_id, request.context) render_values = { - 'project': project + 'project': project, + 'main_object': project, } return request.website.render("website_project.index", render_values) @@ -59,6 +60,7 @@ class website_project(http.Controller): task = task_obj.browse(cr, uid, task_id, context=context) render_values = { - 'task': task + 'task': task, + 'main_object': task, } return request.website.render("website_project.task", render_values) diff --git a/addons/website_project/models/__init__.py b/addons/website_project/models/__init__.py new file mode 100644 index 00000000000..bf67277dc77 --- /dev/null +++ b/addons/website_project/models/__init__.py @@ -0,0 +1 @@ +import website_project \ No newline at end of file diff --git a/addons/website_project/models/website_project.py b/addons/website_project/models/website_project.py new file mode 100644 index 00000000000..30dc36afcb4 --- /dev/null +++ b/addons/website_project/models/website_project.py @@ -0,0 +1,9 @@ +from openerp.osv import orm + +class project(orm.Model): + _name = 'project.project' + _inherit = ['project.project','website.seo.metadata'] + +class task(orm.Model): + _name = 'project.task' + _inherit = ['project.task','website.seo.metadata'] \ No newline at end of file