diff --git a/addons/website/models/view.py b/addons/website/models/view.py index b146b405757..68df3bcb35a 100644 --- a/addons/website/models/view.py +++ b/addons/website/models/view.py @@ -7,6 +7,7 @@ from openerp.osv import osv, fields class view(osv.osv): _inherit = "ir.ui.view" _columns = { + 'name': fields.char('View Name', required=True, translate=True), 'inherit_option_id': fields.many2one('ir.ui.view','Optional Inheritancy'), 'inherited_option_ids': fields.one2many('ir.ui.view','inherit_option_id','Optional Inheritancies'), 'page': fields.boolean("Whether this view is a web page template (complete)"), diff --git a/addons/website/models/website.py b/addons/website/models/website.py index cd0dfaa6940..beb5f8bafee 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -157,6 +157,14 @@ class website(osv.osv): inherit_branding=qweb_context.setdefault('editable', False), ) + main_object = qweb_context.get('main_object') + if main_object: + if 'additional_title' not in qweb_context and 'name' in main_object: + qweb_context['additional_title'] = main_object.name + for key in ['website_description', 'website_keywords']: + if key not in qweb_context and key in main_object: + qweb_context[key] = main_object[key] + # check if xmlid of the template exists try: module, xmlid = template.split('.', 1) diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 12a6a1b2d8a..dbd3f70ce7f 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -303,7 +303,6 @@ -