Merge lp:~openerp-dev/openerp-web/saas-1-notb-chs into lp:~openerp/openerp-web/saas-1

[Christophe Simonis (OpenERP)]

Unmerged revisions

3739. By Christophe Simonis (OpenERP) on 2013-06-13

[FIX] web: do not show traceback when not in debug mode

=== modified file 'addons/web/http.py'
--- addons/web/http.py	2013-06-11 15:52:51 +0000
+++ addons/web/http.py	2013-06-13 16:55:55 +0000
@@ -125,6 +125,26 @@
         with registry.cursor() as cr:
             yield (registry, cr)
 
+    def _serialize_exception(self, e):
+        t = type(e)
+        tmp = {
+            "name": t.__module__ + "." + t.__name__ if t.__module__ else t.__name__,
+            "message": openerp.tools.exception_to_unicode(e),
+            "arguments": to_jsonable(e.args),
+        }
+        if self.debug:
+            tmp['debug'] = traceback.format_exc()
+
+        if isinstance(e, openerp.osv.osv.except_osv):
+            tmp["exception_type"] = "except_osv"
+        elif isinstance(e, openerp.exceptions.Warning):
+            tmp["exception_type"] = "warning"
+        elif isinstance(e, openerp.exceptions.AccessError):
+            tmp["exception_type"] = "access_error"
+        elif isinstance(e, openerp.exceptions.AccessDenied):
+            tmp["exception_type"] = "access_denied"
+        return tmp
+
 def reject_nonliteral(dct):
     if '__ref' in dct:
         raise ValueError(
@@ -209,14 +229,14 @@
             response['id'] = self.jsonrequest.get('id')
             response["result"] = method(self, **self.params)
         except session.AuthenticationError, e:
-            se = serialize_exception(e)
+            se = self._serialize_exception(e)
             error = {
                 'code': 100,
                 'message': "OpenERP Session Invalid",
                 'data': se
             }
         except Exception, e:
-            se = serialize_exception(e)
+            se = self._serialize_exception(e)
             error = {
                 'code': 200,
                 'message': "OpenERP Server Error",
@@ -242,22 +262,6 @@
         r = werkzeug.wrappers.Response(body, headers=[('Content-Type', mime), ('Content-Length', len(body))])
         return r
 
-def serialize_exception(e):
-    tmp = {
-        "name": type(e).__module__ + "." + type(e).__name__ if type(e).__module__ else type(e).__name__,
-        "debug": traceback.format_exc(),
-        "message": u"%s" % e,
-        "arguments": to_jsonable(e.args),
-    }
-    if isinstance(e, openerp.osv.osv.except_osv):
-        tmp["exception_type"] = "except_osv"
-    elif isinstance(e, openerp.exceptions.Warning):
-        tmp["exception_type"] = "warning"
-    elif isinstance(e, openerp.exceptions.AccessError):
-        tmp["exception_type"] = "access_error"
-    elif isinstance(e, openerp.exceptions.AccessDenied):
-        tmp["exception_type"] = "access_denied"
-    return tmp
 
 def to_jsonable(o):
     if isinstance(o, str) or isinstance(o,unicode) or isinstance(o, int) or isinstance(o, long) \
@@ -306,7 +310,7 @@
             r = e
         except Exception, e:
             _logger.exception("An exception occured during an http request")
-            se = serialize_exception(e)
+            se = self._serialize_exception(e)
             error = {
                 'code': 200,
                 'message': "OpenERP Server Error",

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-06-11 15:52:51 +0000
+++ addons/web/static/src/xml/base.xml	2013-06-13 16:55:55 +0000
@@ -53,8 +53,10 @@
 <t t-name="CrashManager.error">
     <div class="oe_error_detail">
         <pre><t t-esc="error.message"/></pre>
-        <hr/>
-        <pre><t t-esc="error.data.debug"/></pre>
+        <t t-if="error.data.debug">
+            <hr/>
+            <pre><t t-esc="error.data.debug"/></pre>
+        </t>
     </div>
 </t>