[IMP] Do not use main_object#name field, use website_meta_* fields

bzr revid: fme@openerp.com-20131014135647-3otn3b6q4gy3olwg

4 files changed, 17 insertions, 17 deletions

diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 68df3bcb35a..f833a2010b4 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -7,12 +7,12 @@ 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)"),
-        'website_description': fields.char("Website Description", translate=True),
-        'website_keywords': fields.char("Website Keywords", translate=True),
+        'website_meta_title': fields.char("Website meta title", size=70, translate=True),
+        'website_meta_description': fields.text("Website meta description", translate=True),
+        'website_meta_keywords': fields.char("Website meta keywords", size=70, translate=True),
     }
     _defaults = {
         'page': False,
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 833424f439a..38b8a870aab 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -157,14 +157,6 @@ 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/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 6aa97110ff6..aa4d126818e 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -423,7 +423,7 @@
                 // return $.Deferred().reject(new Error("No main_object was found."));
                 def.resolve(null);
             } else {
-                var fields = ['name', 'website_description', 'website_keywords'];
+                var fields = ['website_meta_title', 'website_meta_description', 'website_meta_keywords'];
                 var model = website.session.model(obj.model);
                 model.call('read', [[obj.id], fields, website.get_context()]).then(function (data) {
                     if (data.length) {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index c1b6e0b5654..7b90052f0ff 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -18,11 +18,19 @@
                       t-att-data-view-xmlid="xmlid if editable else None"
                       t-att-data-main-object="main_object if editable else None">
                     <head>
-                        <title t-if="title"><t t-esc="title"/></title>
-                        <title t-if="not title"><t t-esc="res_company.name"/><t t-if="additional_title"> - <t t-esc="additional_title"/></t></title>
-                        <meta name="openerp.company" t-att-value="res_company.name" />
-                        <meta name="description" value="" />
-                        <meta name="keywords" value="" />
+                        <t t-if="main_object and 'website_meta_title' in main_object">
+                            <t t-set="title" t-value="main_object.website_meta_title"/>
+                        </t>
+                        <t t-if="not title and main_object and 'name' in main_object">
+                            <t t-set="additional_title" t-value="main_object.name"/>
+                        </t>
+                        <t t-if="not title">
+                            <t t-set="title"><t t-raw="res_company.name"/><t t-if="additional_title"> - <t t-raw="additional_title"/></t></t>
+                        </t>
+                        <title><t t-esc="title"/></title>
+                        <meta name="openerp.company" t-att-value="res_company.name"/>
+                        <meta name="description" t-att-value="main_object.website_meta_description or website_meta_description"/>
+                        <meta name="keywords" t-att-value="main_object.website_meta_keywords or website_meta_keywords"/>
 
                         <!-- Load stylesheets before scripts to avoid blocking -->
                         <link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>