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

[FIX] rename intro JsonRPC and session_id cleanup 

bzr revid: al@openerp.com-20120426220818-yvsr4zwlj824ql1q
This commit is contained in:
Antony Lesuisse 2012-04-27 00:08:18 +02:00
parent a8fe471b36
commit 4ea7057b5d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -865,9 +865,9 @@ instance.web.Registry = instance.web.Class.extend({
}
});
instance.web.BaseConnection = instance.web.CallbackEnabled.extend( /** @lends instance.web.BaseConnection# */{
instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
/**
* @constructs instance.web.BaseConnection
* @constructs instance.web.JsonRPC
* @extends instance.web.CallbackEnabled
*
* @param {String} [server] JSON-RPC endpoint hostname
@ -1199,7 +1199,6 @@ instance.web.BaseConnection = instance.web.CallbackEnabled.extend( /** @lends in
url = { url: url };
}
// Construct a JSON-RPC2 request, method is currently unused
params.session_id = this.session_id;
if (this.debug)
params.debug = 1;
var payload = {
@ -1349,14 +1348,13 @@ instance.web.BaseConnection = instance.web.CallbackEnabled.extend( /** @lends in
},
});
instance.web.Connection = instance.web.BaseConnection.extend( /** @lends instance.web.Connection# */{
instance.web.Connection = instance.web.JsonRPC.extend( /** @lends instance.web.Connection# */{
init: function() {
this._super.apply(this, arguments);
// TODO: session store in cookie should be optional
this.name = instance._session_id;
this.qweb_mutex = new $.Mutex();
},
on_bind: function() {
var self = this;
instance.web.qweb.default_dict['_s'] = this.origin;
@ -1376,7 +1374,10 @@ instance.web.Connection = instance.web.BaseConnection.extend( /** @lends instanc
this.active_id = null;
return this.session_init();
},
rpc: function(url, params, success_callback, error_callback) {
params.session_id = this.session_id;
return this._super(url, params, success_callback, error_callback);
},
session_bind: function(origin) {
return this.bind(origin);
},
@ -1787,6 +1788,7 @@ instance.web.OldWidget = instance.web.Widget.extend({
}
});
}
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: