diff options
| author | bth-openerp <bth@tinyerp.com> | 2013-10-17 18:41:39 +0530 |
|---|---|---|
| committer | bth-openerp <bth@tinyerp.com> | 2013-10-17 18:41:39 +0530 |
| commit | addc2d5f9cefc4c7cd1eb7f3abcc496f2c8eeabe (patch) | |
| tree | 9bcb89044f3ca6854b2942206b73653f52859e84 /addons/website/models | |
| parent | e3d3cf674c461b2d39418b98898e21d32c08a20d (diff) | |
| parent | d5bbf2501a08dd6b0bab0ea4e2e9ff4b0b03fed7 (diff) | |
[MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131017131139-whjjmuin6g9cby9r
Diffstat (limited to 'addons/website/models')
| -rw-r--r-- | addons/website/models/ir_ui_view.py | 4 | ||||
| -rw-r--r-- | addons/website/models/website.py | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index 1b680549164..d6ad607fa3f 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -11,8 +11,8 @@ class view(osv.osv): '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_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), + 'website_meta_description': fields.text("Website meta description", size=160, translate=True), + 'website_meta_keywords': fields.char("Website meta keywords", translate=True), } _defaults = { 'page': False, diff --git a/addons/website/models/website.py b/addons/website/models/website.py index ec9d56632f5..b3aaf611ddc 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -181,11 +181,12 @@ class website(osv.osv): logger.error("Website Rendering Error.\n\n%s" % traceback.format_exc()) return self.render(cr, uid, ids, 'website.404', qweb_context) - try: - main_object = request.registry[view_ref[0]].browse(cr, uid, view_ref[1]) - qweb_context['main_object'] = main_object - except Exception: - pass + if 'main_object' not in qweb_context: + try: + main_object = request.registry[view_ref[0]].browse(cr, uid, view_ref[1]) + qweb_context['main_object'] = main_object + except Exception: + pass try: return view.render( |