odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Removed old useless keys 

bzr revid: nicolas.vanhoren@openerp.com-20130130152926-bhdxho0eyq58s3or
This commit is contained in:
niv-openerp 2013-01-30 16:29:26 +01:00
parent 4776ea75eb
commit 65cfe2ee38
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/web/http.py
View File

@ -197,19 +197,14 @@ class JsonRequest(WebRequest):
error = {
'code': 100,
'message': "OpenERP Session Invalid",
'data': dict(se, **{
'type': 'session_invalid',
})
'data': se
}
except Exception, e:
se = serialize_exception(e)
error = {
'code': 200,
'message': "OpenERP Server Error",
'data': dict(se, **{
'type': 'server_exception',
'fault_code': se["message"],
})
'data': se
}
if error:
response["error"] = error
@ -296,10 +291,7 @@ class HttpRequest(WebRequest):
error = {
'code': 200,
'message': "OpenERP Server Error",
'data': dict(se, **{
'type': 'server_exception',
'fault_code': se["message"],
})
'data': se
}
r = werkzeug.exceptions.InternalServerError(cgi.escape(simplejson.dumps(error)))
if self.debug or 1:

2
addons/web/static/src/js/corelib.js
View File

@ -991,7 +991,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
self.trigger('response', response);
if (!response.error) {
deferred.resolve(response["result"], textStatus, jqXHR);
} else if (response.error.data.type === "session_invalid") {
} else if (response.error.code === 100) {
self.uid = false;
} else {
deferred.reject(response.error, $.Event());