summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/coresetup.js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-07-11 14:20:34 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-07-11 14:20:34 +0200
commit47b5a82ae85e795ae888799426f098066583ecbc (patch)
tree2bfee0144fbbdcd672b1347d0a24e5cda24cbba3 /addons/web/static/src/js/coresetup.js
parenta7adac1189d062ad8797b8d7ead929b27715cf3c (diff)
Completely removed all ways to specify session identifiers and reduced them to 2 possibilities:
* The http argument 'session_id' (higher priority) * The cookie 'session_id' (lower priority) bzr revid: nicolas.vanhoren@openerp.com-20130711122034-3nvmkw4q5z4io4tm
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
-rw-r--r--addons/web/static/src/js/coresetup.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 81de547d0c1..f153d3ad73a 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -23,7 +23,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
this.qweb_mutex = new $.Mutex();
},
rpc: function(url, params, options) {
- params.session_id = this.session_id;
return this._super(url, params, options);
},
/**
@@ -58,7 +57,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
session_init: function () {
var self = this;
// TODO: session store in cookie should be optional
- this.session_id = this.get_cookie('sid');
+ this.session_id = this.get_cookie('session_id');
return this.session_reload().then(function(result) {
var modules = instance._modules.join(',');
var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).then(self.load_qweb.bind(self));