[MERGE] Merge parents

bzr revid: rim@openerp.com-20131104073529-9cnmx1a3idyuyo8s

addons/website/controllers/main.py

@@ -269,7 +269,8 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @website.route(['/robots.txt'], type='http', auth="public")
     def robots(self):
-        return request.website.render('website.robots', {'url_root': request.httprequest.url_root})
+        body = request.website.render('website.robots', {'url_root': request.httprequest.url_root})
+        return request.make_response(body, headers=[('Content-Type', 'text/plain')])
 
     @website.route('/sitemap', type='http', auth='public', multilang=True)
     def sitemap(self, **kwargs):

addons/website/models/website.py

@@ -198,23 +198,14 @@ class website(osv.osv):
             qweb_context['error'] = err[1]
             logger.warn("Website Rendering Error.\n\n%s" % traceback.format_exc())
             return self.render(cr, uid, ids, 'website.401', qweb_context)
-        except (QWebException,), err:
+        except Exception, e:
+            qweb_context['template'] = getattr(e, 'qweb_template', '')
+            node = getattr(e, 'qweb_node', None)
+            qweb_context['node'] = node and node.toxml()
+            qweb_context['expr'] = getattr(e, 'qweb_eval', '')
             qweb_context['traceback'] = traceback.format_exc()
-            qweb_context['template'] = err.template
-            qweb_context['message'] = err.message
-            qweb_context['node'] = err.node and err.node.toxml()
-            logger.error("Website Rendering Error.\n%(message)s\n%(node)s\n\n%(traceback)s" % qweb_context)
-            return view.render(
-                cr, uid,
-                'website.500' if qweb_context['editable'] else 'website.404',
-                qweb_context, context=context)
-        except Exception:
-            logger.exception("Website Rendering Error.")
-            qweb_context['traceback'] = traceback.format_exc()
-            return view.render(
-                cr, uid,
-                'website.500' if qweb_context['editable'] else 'website.404',
-                qweb_context, context=context)
+            logger.error("Website Rendering Error.\n%(template)s\n%(expr)s\n%(node)s\n\n%(traceback)s" % qweb_context)
+            return view.render(cr, uid, 'website.500' if qweb_context['editable'] else 'website.404', qweb_context, context=context)
 
     def pager(self, cr, uid, ids, url, total, page=1, step=30, scope=5, url_args=None):
         # Compute Pager

addons/website/views/website_templates.xml

@@ -364,8 +364,8 @@
                         <h1 class="container mt32">500: Internal Server Error!</h1>
                     </div>
                     <t t-if="editable">
-                        <h3>An exception appear in the template: <span id="exception_template" t-esc="template"/></h3>
-                        <b id="exception_message" t-esc="message"/>
+                        <h3>Exception in template: <span id="exception_template" t-esc="template"/></h3>
+                        <h4 t-if="expr">Expression: <t t-esc="expr"/></h4>
                         <pre id="exception_node" t-esc="node"/>
                         <pre id="exception_traceback" t-esc="traceback"/>
                     </t>