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

[IMP] connection bind via direct server (no split between host and protocol) 

bzr revid: chs@openerp.com-20111216140316-m4adjubcs8e46dli
This commit is contained in:
Christophe Simonis 2011-12-16 15:03:16 +01:00
parent 3deb1083c9
commit 03a86e7bb6
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/web/static/src/js/core.js
View File

@ -355,18 +355,23 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
*/
init: function() {
this._super();
this.server = null;
this.debug = ($.deparam($.param.querystring()).debug != undefined);
// TODO: session store in cookie should be optional
this.name = openerp._session_id;
},
bind: function(host, protocol) {
var self = this;
this.host = (host == undefined) ? location.host : host;
this.protocol = (protocol == undefined) ? location.protocol : protocol;
this.prefix = this.protocol + '//' + this.host;
openerp.web.qweb.default_dict['_s'] = this.prefix
this.rpc_mode = (this.host == location.host) ? "json" : "jsonp";
this.rpc_function = (this.host == location.host) ? this.rpc_json : this.rpc_jsonp;
this.debug = (window.location.search.indexOf('?debug') !== -1);
bind: function(server) {
if (this.server) {
throw new Error("Connection already bound to " + this.server);
}
var hostname = _.str.sprintf('%s//%s', location.protocol, location.host);
this.server = _.str.rtrim((!server) ? hostname : server, '/');
openerp.web.qweb.default_dict['_s'] = this.server;
this.rpc_function = (this.server == hostname) ? this.rpc_json : this.rpc_jsonp;
this.prefix = this.server; // make al happy
this.session_id = false;
this.uid = false;
this.username = false;