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

[MERGE] Connection splitted into JsonRPC and Session 

bzr revid: al@openerp.com-20120426223257-c04x8o03fpr96dg1
This commit is contained in:
Antony Lesuisse 2012-04-27 00:32:57 +02:00
parent 74ecaa99df f7e3de5483
commit 59b1392937
3 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/web/static/src/js/boot.js
View File

@ -14,8 +14,8 @@
var openerp = this.openerp = {
// Per session namespace
// openerp.<module> will map to
// openerp.sessions.sessionname.<module> using a closure
sessions: {},
// openerp.instances.sessionname.<module> using a closure
instances: {},
/**
* OpenERP instance constructor
*
@ -23,19 +23,19 @@
*/
init: function(modules) {
// By default only web will be loaded, the rest will be by loaded
// by openerp.web.Connection on the first session_authenticate
// by openerp.web.Session on the first session_authenticate
modules = modules || ["web"];
var new_instance = {
// links to the global openerp
_openerp: openerp,
// this unique id will be replaced by hostname_databasename by
// openerp.web.Connection on the first connection
_session_id: "session" + session_counter++,
// openerp.web.Session on the first connection
_session_id: "instance" + session_counter++,
_modules: modules,
web: {},
web_mobile: {}
};
openerp.sessions[new_instance._session_id] = new_instance;
openerp.instances[new_instance._session_id] = new_instance;
for(var i=0; i < modules.length; i++) {
openerp[modules[i]](new_instance);
}

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

@ -756,7 +756,7 @@ instance.web.Registry = instance.web.Class.extend({
* registry was created.
*
* An object path is simply a dotted name from the instance root to the
* object pointed to (e.g. ``"instance.web.Connection"`` for an OpenERP
* object pointed to (e.g. ``"instance.web.Session"`` for an OpenERP
* connection object).
*
* @constructs instance.web.Registry
@ -865,9 +865,9 @@ instance.web.Registry = instance.web.Class.extend({
}
});
instance.web.Connection = instance.web.CallbackEnabled.extend( /** @lends instance.web.Connection# */{
instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
/**
* @constructs instance.web.Connection
* @constructs instance.web.JsonRPC
* @extends instance.web.CallbackEnabled
*
* @param {String} [server] JSON-RPC endpoint hostname
@ -877,32 +877,13 @@ instance.web.Connection = instance.web.CallbackEnabled.extend( /** @lends instan
this._super();
this.server = null;
this.debug = ($.deparam($.param.querystring()).debug != undefined);
// TODO: session store in cookie should be optional
this.name = instance._session_id;
this.qweb_mutex = new $.Mutex();
},
session_bind: function(origin) {
setup: function(origin) {
var window_origin = location.protocol+"//"+location.host, self=this;
this.origin = origin ? _.str.rtrim(origin,'/') : window_origin;
this.prefix = this.origin;
this.server = this.origin; // keep chs happy
instance.web.qweb.default_dict['_s'] = this.origin;
this.rpc_function = (this.origin == window_origin) ? this.rpc_json : this.rpc_jsonp;
this.session_id = false;
this.uid = false;
this.username = false;
this.user_context= {};
this.db = false;
this.openerp_entreprise = false;
this.module_list = instance._modules.slice();
this.module_loaded = {};
_(this.module_list).each(function (mod) {
self.module_loaded[mod] = true;
});
this.context = {};
this.shortcuts = [];
this.active_id = null;
return this.session_init();
},
test_eval_get_context: function () {
var asJS = function (arg) {
@ -1211,7 +1192,6 @@ instance.web.Connection = instance.web.CallbackEnabled.extend( /** @lends instan
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 = {
@ -1359,6 +1339,42 @@ instance.web.Connection = instance.web.CallbackEnabled.extend( /** @lends instan
},
on_rpc_error: function(error) {
},
});
instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Session# */{
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();
},
rpc: function(url, params, success_callback, error_callback) {
params.session_id = this.session_id;
return this._super(url, params, success_callback, error_callback);
},
/**
* Setup a sessionm
*/
session_bind: function(origin) {
var self = this;
this.setup(origin);
instance.web.qweb.default_dict['_s'] = this.origin;
this.session_id = false;
this.uid = false;
this.username = false;
this.user_context= {};
this.db = false;
this.openerp_entreprise = false;
this.module_list = instance._modules.slice();
this.module_loaded = {};
_(this.module_list).each(function (mod) {
self.module_loaded[mod] = true;
});
this.context = {};
this.shortcuts = [];
this.active_id = null;
return this.session_init();
},
/**
* Init a session, reloads from cookie, if it exists
*/
@ -1766,6 +1782,7 @@ instance.web.OldWidget = instance.web.Widget.extend({
}
});
}
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

4
addons/web/static/src/js/coresetup.js
View File

@ -98,8 +98,8 @@ $.Mutex = (function() {
return Mutex;
})();
/** Setup default connection */
instance.connection = new instance.web.Connection();
/** Setup default session */
instance.connection = new instance.web.Session();
instance.web.qweb.default_dict['__debug__'] = instance.connection.debug;
$.async_when = function() {